Skip to content

Commit 1ac3ea9

Browse files
scrappyscrappy
committed
This should clean everything up back to pre-configure status
1 parent 03f0136 commit 1ac3ea9

File tree

1 file changed

+32
-47
lines changed

1 file changed

+32
-47
lines changed

‎src/include/config.h

Lines changed: 32 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* include/config.h. Generated automatically by configure. */
21
/* the purpose of this file is to reduce the use of #ifdef's through
32
* the code base by those porting the software, and to facilitate the
43
* eventual use of autoconf to build the server
@@ -9,63 +8,25 @@
98

109
#define BLCKSZ 8192
1110

12-
/*
13-
* The following is set using configure.
14-
*/
15-
16-
/* Set to 1 if you have <termios.h> */
17-
#define HAVE_TERMIOS_H 1
18-
19-
/* Set to 1 if you have <limits.h> */
20-
#define HAVE_LIMITS_H 1
21-
22-
/* Set to 1 if you have <values.h> */
23-
/* #undef HAVE_VALUES_H */
24-
25-
/* Set to 1 if you have isinf() */
26-
#define HAVE_ISINF 1
27-
28-
/* Set to 1 if you have tzset() */
29-
#define HAVE_TZSET 1
30-
31-
/* Set to 1 if you have cbrt() */
32-
/* #undef HAVE_CBRT */
33-
34-
/*
35-
* Code below this point should not require changes
36-
*/
37-
38-
#if defined(HAVE_TERMIOS_H)
39-
# define TERMIOS_H_LOCATION <termios.h>
11+
#if defined(aix)
12+
#define TERMIOS_H_LOCATION <termios.h>
4013
#else
41-
# define TERMIOS_H_LOCATION <sys/termios.h>
14+
#define TERMIOS_H_LOCATION <sys/termios.h>
4215
#endif
4316

44-
/* Temporary: Need to change source files from USE_VALUES_H to HAVE_VALUES_H */
45-
#if defined(HAVE_VALUES_H)
17+
#if !defined(nextstep)
4618
#define USE_VALUES_H
4719
#endif
4820

49-
/* Temporary: Need to change source files from USE_LIMITS_H to HAVE_LIMITS_H */
50-
#if defined(HAVE_LIMITS_H)
51-
# define USE_LIMITS_H
52-
#endif
53-
54-
#if !defined(HAVE_ISINF)
55-
# define NEED_ISINF
56-
#endif
57-
58-
#if !defined(HAVE_CBRT)
59-
# define NEED_CBRT
60-
#endif
61-
6221
#define HAVE_MEMMOVE
6322

6423
#if defined(aix)
6524
# define CLASS_CONFLICT
6625
# define DISABLE_XOPEN_NLS
26+
# define NEED_ISINF
6727
# define NEED_UNION_SEMUN
6828
# define NEED_SYS_SELECT_H
29+
# define HAVE_TZSET
6930
# define HAVE_ANSI_CPP
7031
# define HAS_TEST_AND_SET
7132
typedef unsigned int slock_t;
@@ -75,6 +36,7 @@
7536
# define USE_POSIX_TIME
7637
# define USE_POSIX_SIGNALS
7738
# define DISABLE_XOPEN_NLS
39+
# define NEED_ISINF
7840
# define HAS_LONG_LONG
7941
# define NEED_UNION_SEMUN
8042
# define HAS_TEST_AND_SET
@@ -83,11 +45,13 @@
8345
#endif
8446

8547
#if defined(BSD44_derived)
48+
# define USE_LIMITS_H
8649
# define USE_POSIX_TIME
50+
# define NEED_CBRT
8751
# define NEED_I386_TAS_ASM
8852
# define HAS_TEST_AND_SET
8953
# if defined(__mips__)
90-
/* # undef HAS_TEST_AND_SET */
54+
# undef HAS_TEST_AND_SET
9155
# endif
9256
typedef unsigned char slock_t;
9357
#endif
@@ -102,7 +66,9 @@
10266
# if defined(PRE_BSDI_2_1)
10367
# define NEED_UNION_SEMUN
10468
# endif
69+
# define USE_LIMITS_H
10570
# define USE_POSIX_TIME
71+
# define NEED_CBRT
10672
# define HAS_TEST_AND_SET
10773
typedef unsigned char slock_t;
10874
#endif
@@ -117,17 +83,22 @@
11783
#if defined(hpux)
11884
# define JMP_BUF
11985
# define USE_POSIX_TIME
86+
# define HAVE_TZSET
87+
# define NEED_CBRT
12088
# define NEED_RINT
12189
# define NEED_UNION_SEMUN
12290
# define HAS_TEST_AND_SET
12391
typedef struct { int sem[4]; } slock_t;
12492
#endif
12593

12694
#if defined(i386_solaris)
95+
# define USE_LIMITS_H
12796
# define USE_POSIX_TIME
12897
# define USE_POSIX_SIGNALS
98+
# define NEED_ISINF
12999
# define NEED_RUSAGE
130100
# define NO_EMPTY_STMTS
101+
# define HAVE_TZSET
131102
# define NEED_UNION_SEMUN
132103
# define SYSV_DIRENT
133104
# define HAS_TEST_AND_SET
@@ -137,8 +108,10 @@
137108
#if defined(irix5)
138109
# define USE_POSIX_TIME
139110
# define USE_POSIX_SIGNALS
111+
# define NEED_ISINF
140112
# define NO_EMPTY_STMTS
141113
# define NO_VFORK
114+
# define HAVE_TZSET
142115
# define SYSV_DIRENT
143116
# define HAS_TEST_AND_SET
144117
# include <abi_mutex.h>
@@ -154,6 +127,8 @@
154127
*/
155128
# define JMP_BUF
156129
# define USE_POSIX_TIME
130+
# define HAVE_TZSET
131+
# define NEED_CBRT
157132
# define NEED_I386_TAS_ASM
158133
# define HAS_TEST_AND_SET
159134
typedef unsigned char slock_t;
@@ -177,6 +152,7 @@
177152
# define NEED_SIG_JMP
178153
# endif
179154

155+
# define USE_LIMITS_H
180156
# define JMP_BUF
181157
# define NO_WAITPID
182158
typedef struct mutex slock_t;
@@ -187,11 +163,14 @@
187163
#endif
188164

189165
#if defined(sparc_solaris)
166+
# define USE_LIMITS_H
190167
# define USE_POSIX_TIME
191168
# define USE_POSIX_SIGNALS
169+
# define NEED_ISINF
192170
# define NEED_RUSAGE
193171
# define NO_EMPTY_STMTS
194172
# define USE_POSIX_TIME
173+
# define HAVE_TZSET
195174
# define NEED_UNION_SEMUN
196175
# define SYSV_DIRENT
197176
# define HAS_TEST_AND_SET
@@ -200,14 +179,16 @@ typedef unsigned char slock_t;
200179

201180
#if defined(sunos4)
202181
# define USE_POSIX_TIME
203-
/* # undef HAVE_MEMMOVE */
182+
# undef HAVE_MEMMOVE
204183
#endif
205184

206185
#if defined(svr4)
207186
# define USE_POSIX_TIME
208187
# define USE_POSIX_SIGNALS
188+
# define NEED_ISINF
209189
# define NEED_RUSAGE
210190
# define NO_EMPTY_STMTS
191+
# define HAVE_TZSET
211192
# define NEED_UNION_SEMUN
212193
# define SYSV_DIRENT
213194
#endif
@@ -219,12 +200,16 @@ typedef unsigned char slock_t;
219200
# define USES_WINSOCK
220201
# define NOFILE 100
221202
# define NEED_UNION_SEMUN
203+
# define HAVE_TZSET
204+
# define NEED_CBRT
205+
# define NEED_ISINF
222206
# ifndef MAXPATHLEN
223207
# define MAXPATHLEN 250
224208
# endif
225209
#endif /* WIN32 */
226210

227211
#if defined(ultrix4)
212+
# define NEED_ISINF
228213
# define USE_POSIX_TIME
229214
# define NEED_UNION_SEMUN
230215
# define NEED_STRDUP

0 commit comments

Comments
 (0)