diff options
Diffstat (limited to 'xorg-server/include/misc.h')
| -rw-r--r-- | xorg-server/include/misc.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h index bdcc8cc1e..f0c92abeb 100644 --- a/xorg-server/include/misc.h +++ b/xorg-server/include/misc.h @@ -80,6 +80,11 @@ OF THIS SOFTWARE. #include <stddef.h> #include <stdint.h> +#include <unistd.h> + +#ifdef _MSC_VER +#define inline __inline +#endif #ifndef MAXSCREENS #define MAXSCREENS 16 @@ -165,9 +170,9 @@ typedef struct _xReq *xReqPtr; #include <math.h> #undef MAXSHORT -#define MAXSHORT SHRT_MAX +#define MAXSHORT 32767 #undef MINSHORT -#define MINSHORT SHRT_MIN +#define MINSHORT -32768 #undef MAXINT #define MAXINT INT_MAX #undef MININT @@ -195,7 +200,7 @@ typedef struct _xReq *xReqPtr; * @param bits The minimum number of bits needed. * @return The number of bytes needed to hold bits. */ -static inline int +static __inline int bits_to_bytes(const int bits) { return ((bits + 7) >> 3); } @@ -205,7 +210,7 @@ bits_to_bytes(const int bits) { * @param bytes The minimum number of bytes needed. * @return The number of 4-byte units needed to hold bytes. */ -static inline int +static __inline int bytes_to_int32(const int bytes) { return (((bytes) + 3) >> 2); } @@ -215,7 +220,7 @@ bytes_to_int32(const int bytes) { * @param bytes The minimum number of bytes needed. * @return The closest multiple of 4 that is equal or higher than bytes. */ -static inline int +static __inline int pad_to_int32(const int bytes) { return (((bytes) + 3) & ~3); } |