chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import release 0.1.14
[secnet.git]
/
config.h.bot
diff --git
a/config.h.bot
b/config.h.bot
index 889736c5ee511249344e0b743ddecdaa1eda6805..bb24eb149e3b0d926dfcc8437b6946f60bcf018a 100644
(file)
--- a/
config.h.bot
+++ b/
config.h.bot
@@
-10,8
+10,10
@@
#else
#if SIZEOF_UNSIGNED_LONG_LONG==8
typedef unsigned long long uint64_t;
#else
#if SIZEOF_UNSIGNED_LONG_LONG==8
typedef unsigned long long uint64_t;
+typedef long long int64_t;
#elif SIZEOF_UNSIGNED_LONG==8
typedef unsigned long uint64_t;
#elif SIZEOF_UNSIGNED_LONG==8
typedef unsigned long uint64_t;
+typedef long int64_t;
#else
#error I do not know what to use for a uint64_t.
#endif
#else
#error I do not know what to use for a uint64_t.
#endif
@@
-19,8
+21,10
@@
typedef unsigned long uint64_t;
/* Give us an unsigned 32-bit data type. */
#if SIZEOF_UNSIGNED_LONG==4
typedef unsigned long uint32_t;
/* Give us an unsigned 32-bit data type. */
#if SIZEOF_UNSIGNED_LONG==4
typedef unsigned long uint32_t;
+typedef long int32_t;
#elif SIZEOF_UNSIGNED_INT==4
typedef unsigned int uint32_t;
#elif SIZEOF_UNSIGNED_INT==4
typedef unsigned int uint32_t;
+typedef int int32_t;
#else
#error I do not know what to use for a uint32_t.
#endif
#else
#error I do not know what to use for a uint32_t.
#endif
@@
-28,8
+32,10
@@
typedef unsigned int uint32_t;
/* An unsigned 16-bit data type. */
#if SIZEOF_UNSIGNED_INT==2
typedef unsigned int uint16_t;
/* An unsigned 16-bit data type. */
#if SIZEOF_UNSIGNED_INT==2
typedef unsigned int uint16_t;
+typedef int int16_t;
#elif SIZEOF_UNSIGNED_SHORT==2
typedef unsigned short uint16_t;
#elif SIZEOF_UNSIGNED_SHORT==2
typedef unsigned short uint16_t;
+typedef short int16_t;
#else
#error I do not know what to use for a uint16_t.
#endif
#else
#error I do not know what to use for a uint16_t.
#endif
@@
-49,4
+55,12
@@
typedef unsigned char uint8_t;
#include "snprintf.h"
#endif
#include "snprintf.h"
#endif
+#ifdef __GNUC__
+#define NORETURN(_x) void _x __attribute__ ((noreturn))
+#define FORMAT(_a,_b,_c) __attribute__ ((format (_a,_b,_c)))
+#else
+#define NORETURN(_x) _x
+#define FORMAT(_a,_b,_c)
+#endif
+
#endif /* _CONFIG_H */
#endif /* _CONFIG_H */