projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integer type name change.
[silc.git]
/
includes
/
silcincludes.h
diff --git
a/includes/silcincludes.h
b/includes/silcincludes.h
index 65bd6a07a40a013b07088de7fcc8bfb514478009..ebdea361e518c19f7ca92cc220efbf88c60b6410 100644
(file)
--- a/
includes/silcincludes.h
+++ b/
includes/silcincludes.h
@@
-205,62
+205,54
@@
extern "C" {
#endif
/* Define types. The types must be at least of the specified size */
#endif
/* Define types. The types must be at least of the specified size */
-#undef uint8
-#undef uint16
-#undef uint32
-#undef uin64
-#undef int8
-#undef int16
-#undef int32
-#undef int64
-
-typedef unsigned char uint8;
-typedef signed char int8;
+
+typedef unsigned char SilcUInt8;
+typedef signed char SilcInt8;
#if SILC_SIZEOF_SHORT > 2
#error "size of the short must be 2 bytes"
#endif
#if SILC_SIZEOF_SHORT > 2
#error "size of the short must be 2 bytes"
#endif
-typedef unsigned short
ui
nt16;
-typedef signed short
i
nt16;
+typedef unsigned short
SilcUI
nt16;
+typedef signed short
SilcI
nt16;
#if SILC_SIZEOF_LONG == 4
#if SILC_SIZEOF_LONG == 4
-typedef unsigned long
ui
nt32;
-typedef signed long
i
nt32;
+typedef unsigned long
SilcUI
nt32;
+typedef signed long
SilcI
nt32;
#else
#if SILC_SIZEOF_INT == 4
#else
#if SILC_SIZEOF_INT == 4
-typedef unsigned
long ui
nt32;
-typedef signed
long i
nt32;
+typedef unsigned
int SilcUI
nt32;
+typedef signed
int SilcI
nt32;
#else
#if SILC_SIZEOF_LONG_LONG >= 4
#ifndef WIN32
#else
#if SILC_SIZEOF_LONG_LONG >= 4
#ifndef WIN32
-typedef unsigned long long
ui
nt32;
-typedef signed long long
i
nt32;
+typedef unsigned long long
SilcUI
nt32;
+typedef signed long long
SilcI
nt32;
#endif
#endif
#endif
#endif
#if SILC_SIZEOF_LONG >= 8
#endif
#endif
#endif
#endif
#if SILC_SIZEOF_LONG >= 8
-typedef unsigned long
ui
nt64;
-typedef signed long
i
nt64;
+typedef unsigned long
SilcUI
nt64;
+typedef signed long
SilcI
nt64;
#else
#if SILC_SIZEOF_LONG_LONG >= 8
#ifndef WIN32
#else
#if SILC_SIZEOF_LONG_LONG >= 8
#ifndef WIN32
-typedef unsigned long long
ui
nt64;
-typedef signed long long
i
nt64;
+typedef unsigned long long
SilcUI
nt64;
+typedef signed long long
SilcI
nt64;
#else
#else
-typedef
uint32 ui
nt64; /* XXX Use Windows's own 64 bit types */
-typedef
int32 i
nt64;
+typedef
SilcUInt32 SilcUI
nt64; /* XXX Use Windows's own 64 bit types */
+typedef
SilcInt32 SilcI
nt64;
#endif
#else
#endif
#else
-typedef
uint32 ui
nt64;
-typedef
int32 i
nt64;
+typedef
SilcUInt32 SilcUI
nt64;
+typedef
SilcInt32 SilcI
nt64;
#endif
#endif
#if SILC_SIZEOF_VOID_P < 4
#endif
#endif
#if SILC_SIZEOF_VOID_P < 4
-typedef
ui
nt32 * void *;
+typedef
SilcUI
nt32 * void *;
#endif
#ifndef __cplusplus
#endif
#ifndef __cplusplus