diff options
Diffstat (limited to 'xorg-server/include/misc.h')
| -rw-r--r-- | xorg-server/include/misc.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h index 1fea73ec3..1fd24ffa6 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 @@ -168,9 +173,9 @@ static inline uint16_t lswaps(uint16_t x) #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 @@ -198,7 +203,7 @@ static inline uint16_t lswaps(uint16_t x) * @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); } @@ -208,7 +213,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); } @@ -218,7 +223,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); } @@ -268,7 +273,7 @@ static inline void wrong_size(void) { } -static inline void __builtin_constant_p(int x) +static inline int __builtin_constant_p(int x) { return 0; } |