X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=global.h;h=d771cef75da6331fb73cca1781d8fac502e2c83b;hb=0044f7218f9a1108a192334a94a4370310be8a33;hp=d85b156c27b2e01b194e3fbf6658a44214c26f9a;hpb=42336b017ba010d03c1db3c28c8549e5d97a1cd9;p=debian%2Fgcpegg diff --git a/global.h b/global.h index d85b156..d771cef 100644 --- a/global.h +++ b/global.h @@ -32,13 +32,35 @@ #include "byteorder.h" /* Build byte-order independent version */ /* Good for i386, but be careful... */ -typedef unsigned char byte; -typedef unsigned char uint8; -typedef unsigned short uint16; -typedef unsigned long uint32; -typedef char int8; -typedef short int16; -typedef long int32; +/* +#ifdef linux +#include + typedef __u8 byte; + typedef __u8 uint8; + typedef __u16 uint16; + typedef __u32 uint32; + typedef __s8 int8; + typedef __s16 int16; + typedef __s32 int32; +#else + typedef unsigned char byte; + typedef unsigned char uint8; + typedef unsigned ushort uint16; + typedef unsigned uint uint32; + typedef char int8; + typedef short int16; + typedef int int32; +#endif +*/ + +#include +typedef uint8_t byte; +typedef uint8_t uint8; +typedef uint16_t uint16; +typedef uint32_t uint32; +typedef int8_t int8; +typedef int16_t int16; +typedef int32_t int32; /* Some fixed assumptions: Trial type is always bitsum. @@ -157,7 +179,7 @@ typedef struct eggentry { char *primbasket; int16 conntype; int16 connival; /* Connect interval in minutes */ - int32 lastupd; /* Zulutime of last update received */ + uint32 lastupd; /* Zulutime of last update received */ int16 setup; /* Does setup match config file? */ char *upcmd; /* Command to bring net up (req if conntype == DND) */ char *dncmd; /* Command to bring net down */