Skip to content

Commit 970e3f6

Browse files
committed
I reversed a bunch of the #define's inadvertantly...
Fixed them, and am re-committing
1 parent a961613 commit 970e3f6

File tree

1 file changed

+23
-17
lines changed

1 file changed

+23
-17
lines changed

src/include/config.h

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,35 @@
88

99
#define BLCKSZ 8192
1010

11+
#define HAVE_SYS_SELECT_H
12+
#define HAVE_TERMIOS_H
1113
#define HAVE_VALUES_H
14+
1215
#define HAVE_MEMMOVE
13-
#define HAVE_TERMIOS_H
1416
#define HAVE_SIGSETJMP
17+
#define HAVE_KILL
18+
#define HAVE_ISINF
19+
#define HAVE_CBRT
20+
#define HAVE_RINT
1521

1622
#if defined(aix)
23+
# undef HAVE_SYS_SELECT_H
1724
# undef HAVE_TERMIOS_H
25+
# undef HAVE_ISINF
1826
# define CLASS_CONFLICT
1927
# define DISABLE_XOPEN_NLS
20-
# define HAVE_ISINF
2128
# define NEED_UNION_SEMUN
22-
# define HAVE_SYS_SELECT_H
2329
# define HAVE_TZSET
2430
# define HAVE_ANSI_CPP
2531
# define HAS_TEST_AND_SET
2632
typedef unsigned int slock_t;
2733
#endif
2834

2935
#if defined(alpha)
36+
# undef HAVE_ISINF
3037
# define USE_POSIX_TIME
3138
# define USE_POSIX_SIGNALS
3239
# define DISABLE_XOPEN_NLS
33-
# define HAVE_ISINF
3440
# define HAS_LONG_LONG
3541
# define NEED_UNION_SEMUN
3642
# define HAS_TEST_AND_SET
@@ -41,7 +47,6 @@
4147
#if defined(BSD44_derived)
4248
# define HAVE_LIMITS_H
4349
# define USE_POSIX_TIME
44-
# define HAVE_CBRT
4550
# define NEED_I386_TAS_ASM
4651
# define HAS_TEST_AND_SET
4752
# if defined(__mips__)
@@ -62,7 +67,7 @@
6267
# endif
6368
# define HAVE_LIMITS_H
6469
# define USE_POSIX_TIME
65-
# define HAVE_CBRT
70+
# undef HAVE_CBRT
6671
# define HAS_TEST_AND_SET
6772
typedef unsigned char slock_t;
6873
#endif
@@ -78,8 +83,8 @@
7883
# define JMP_BUF
7984
# define USE_POSIX_TIME
8085
# define HAVE_TZSET
81-
# define HAVE_CBRT
82-
# define HAVE_RINT
86+
# undef HAVE_CBRT
87+
# undef HAVE_RINT
8388
# define NEED_UNION_SEMUN
8489
# define HAS_TEST_AND_SET
8590
typedef struct { int sem[4]; } slock_t;
@@ -89,7 +94,7 @@
8994
# define HAVE_LIMITS_H
9095
# define USE_POSIX_TIME
9196
# define USE_POSIX_SIGNALS
92-
# define HAVE_ISINF
97+
# undef HAVE_ISINF
9398
# define NEED_RUSAGE
9499
# define NO_EMPTY_STMTS
95100
# define HAVE_TZSET
@@ -102,7 +107,7 @@
102107
#if defined(irix5)
103108
# define USE_POSIX_TIME
104109
# define USE_POSIX_SIGNALS
105-
# define HAVE_ISINF
110+
# undef HAVE_ISINF
106111
# define NO_EMPTY_STMTS
107112
# define NO_VFORK
108113
# define HAVE_TZSET
@@ -122,7 +127,7 @@
122127
# define JMP_BUF
123128
# define USE_POSIX_TIME
124129
# define HAVE_TZSET
125-
# define HAVE_CBRT
130+
# undef HAVE_CBRT
126131
# define NEED_I386_TAS_ASM
127132
# define HAS_TEST_AND_SET
128133
typedef unsigned char slock_t;
@@ -161,7 +166,7 @@
161166
# define HAVE_LIMITS_H
162167
# define USE_POSIX_TIME
163168
# define USE_POSIX_SIGNALS
164-
# define HAVE_ISINF
169+
# undef HAVE_ISINF
165170
# define NEED_RUSAGE
166171
# define NO_EMPTY_STMTS
167172
# define USE_POSIX_TIME
@@ -180,7 +185,7 @@ typedef unsigned char slock_t;
180185
#if defined(svr4)
181186
# define USE_POSIX_TIME
182187
# define USE_POSIX_SIGNALS
183-
# define HAVE_ISINF
188+
# undef HAVE_ISINF
184189
# define NEED_RUSAGE
185190
# define NO_EMPTY_STMTS
186191
# define HAVE_TZSET
@@ -189,22 +194,23 @@ typedef unsigned char slock_t;
189194
#endif
190195

191196
#if defined(win32)
192-
# define JMP_BUF
197+
# undef HAVE_KILL
193198
# undef HAVE_SIGSETJMP
199+
# undef HAVE_CBRT
200+
# undef HAVE_ISINF
201+
# define JMP_BUF
194202
# define NO_UNISTD_H
195203
# define USES_WINSOCK
196204
# define NOFILE 100
197205
# define NEED_UNION_SEMUN
198206
# define HAVE_TZSET
199-
# define HAVE_CBRT
200-
# define HAVE_ISINF
201207
# ifndef MAXPATHLEN
202208
# define MAXPATHLEN 250
203209
# endif
204210
#endif /* WIN32 */
205211

206212
#if defined(ultrix4)
207-
# define HAVE_ISINF
213+
# undef HAVE_ISINF
208214
# define USE_POSIX_TIME
209215
# define NEED_UNION_SEMUN
210216
# define NEED_STRDUP

0 commit comments

Comments
 (0)