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-8/include/stdinc.h (file contents), Revision 1156 by michael, Tue Aug 9 20:29:20 2011 UTC vs.
ircd-hybrid/trunk/include/stdinc.h (file contents), Revision 6345 by michael, Tue Aug 11 17:23:26 2015 UTC

# Line 16 | Line 16
16   *
17   *  You should have received a copy of the GNU General Public License
18   *  along with this program; if not, write to the Free Software
19 < *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19 > *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
20   *  USA
21   *
22   * $Id$
23   *
24   */
25  
26 < #ifndef STDINC_H /* prevent multiple #includes */
27 < #define STDINC_H
28 <
26 > #ifndef INCLUDED_stdinc_h /* prevent multiple #includes */
27 > #define INCLUDED_stdinc_h
28 >
29   #include "config.h"
30  
31   #include "defaults.h"
# Line 33 | Line 33
33   #include <stddef.h>
34   #include <stdlib.h>
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 40 | Line 42
42  
43   #include <sys/types.h>
44  
43 – #ifdef HAVE_INTTYPES_H
44 – #include <inttypes.h>
45 – #else
46 – #ifdef HAVE_STDINT_H
47 – #include <stdint.h>
48 – #endif
49 – #endif
50 –
45   #ifdef HAVE_CRYPT_H
46   #include <crypt.h>
47   #endif
# Line 57 | Line 51
51   #include <openssl/err.h>
52   #endif
53  
54 + #ifdef HAVE_LIBGEOIP
55 + #include <GeoIP.h>
56 + #endif
57 +
58   #include <stdio.h>
59   #include <assert.h>
60   #include <time.h>
# Line 93 | Line 91
91   #include <sys/param.h>
92   #endif
93  
94 < #ifdef HAVE_ERRNO_H
95 < #include <errno.h>
94 > #ifdef PATH_MAX
95 > #define HYB_PATH_MAX PATH_MAX
96   #else
97 < extern int errno;
97 > #define HYB_PATH_MAX 4096
98   #endif
99 +
100 + #if 0 && __GNUC__
101 + #define AFP(a,b) __attribute__((format (printf, a, b)))
102 + #else
103 + #define AFP(a,b)
104 + #endif
105 +
106   #endif

Diff Legend

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