ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/include/stdinc.h
(Generate patch)

Comparing:
ircd-hybrid-7.2/include/stdinc.h (file contents), Revision 912 by michael, Wed Nov 7 22:47:44 2007 UTC vs.
ircd-hybrid/trunk/include/stdinc.h (file contents), Revision 1761 by michael, Fri Jan 18 19:21:39 2013 UTC

# Line 30 | Line 30
30  
31   #include "defaults.h"
32  
33 < #ifdef HAVE_STDLIB_H
33 > #include <stddef.h>
34   #include <stdlib.h>
35 < #endif
36 < #ifdef STRING_WITH_STRINGS
37 < # include <string.h>
38 < # include <strings.h>
39 < #else
40 < # ifdef HAVE_STRING_H
41 < #  include <string.h>
42 < # else
43 < #  ifdef HAVE_STRINGS_H
44 < #   include <strings.h>
45 < #  endif
46 < # endif
47 < #endif  
35 > #include <string.h>
36 > #include <stdint.h>
37 > #include <errno.h>
38  
39   #ifdef HAVE_STRTOK_R
40   # define strtoken(x, y, z) strtok_r(y, z, x)
# Line 52 | Line 42
42  
43   #include <sys/types.h>
44  
55 – #ifdef HAVE_INTTYPES_H
56 – #include <inttypes.h>
57 – #else
58 – #ifdef HAVE_STDINT_H
59 – #include <stdint.h>
60 – #endif
61 – #endif
62 –
63 – #ifdef HAVE_STDDEF_H
64 – # include <stddef.h>
65 – #else /* This is basically what stddef.h provides on most systems */
66 – # ifndef NULL
67 – #  define NULL ((void*)0)
68 – # endif
69 – # ifndef offsetof
70 – #  define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
71 – # endif
72 – #endif
73 –
45   #ifdef HAVE_CRYPT_H
46   #include <crypt.h>
47   #endif
# Line 85 | Line 56
56   #include <time.h>
57   #include <fcntl.h>
58  
88 – #ifdef HAVE_LIBGEN_H
89 – #include <libgen.h>
90 – #endif
91 –
59   #include <stdarg.h>
60   #include <signal.h>
61   #include <ctype.h>
62  
96 – #ifdef _WIN32
97 – #define PATH_MAX (MAX_PATH - 1)
98 – #define WIN32_LEAN_AND_MEAN
99 – #include <windows.h>
100 – #include <winsock.h>
101 – #else
63   #include <dirent.h>
64   #include <netdb.h>
65   #include <sys/socket.h>
# Line 106 | Line 67
67   #include <arpa/inet.h>
68   #include <sys/time.h>
69   #include <sys/file.h>
109 – #endif
70  
71   #include <limits.h>
72  
# Line 127 | Line 87
87   #include <sys/param.h>
88   #endif
89  
90 < #ifdef HAVE_ERRNO_H
91 < #include <errno.h>
90 > #ifdef PATH_MAX
91 > #define HYB_PATH_MAX PATH_MAX
92   #else
93 < extern int errno;
93 > #define HYB_PATH_MAX 4096
94   #endif
95  
96 < #include "inet_misc.h"
97 <
98 < #ifdef _WIN32
99 < #undef strcasecmp
140 < #define strcasecmp stricmp
96 > #if 0 && __GNUC__
97 > #define AFP(a,b) __attribute__((format (printf, a, b)))
98 > #else
99 > #define AFP(a,b)
100   #endif
101  
102   #endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)