Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita245ba7

Browse files
committed
Okay, that does it for tonight...
Cleaned out alot of the #define that can be auto-detect'd byconfigure from config.h...
1 parentca6da61 commita245ba7

File tree

2 files changed

+49
-34
lines changed

2 files changed

+49
-34
lines changed

‎src/configure.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ dnl Checks for header files.
9696
AC_HEADER_STDC
9797
AC_HEADER_SYS_WAIT
9898
AC_CHECK_HEADERS(fcntl.h limits.h sys/file.h sys/ioctl.h sys/time.h unistd.h)
99-
AC_CHECK_HEADERS(termios.h values.h)
99+
AC_CHECK_HEADERS(termios.h values.h sys/select.h)
100100

101101
dnl Checks for typedefs, structures, and compiler characteristics.
102102
AC_C_CONST
@@ -114,6 +114,6 @@ AC_FUNC_MEMCMP
114114
AC_TYPE_SIGNAL
115115
AC_FUNC_VPRINTF
116116
AC_CHECK_FUNCS(ftime getcwd gethostname gettimeofday putenv regcomp select socket strcspn strdup strerror strftime strspn strtod strtol)
117-
AC_CHECK_FUNCS(isinf tzset cbrt)
117+
AC_CHECK_FUNCS(isinf tzset cbrt rint rusage vfork memmove)
118118

119119
AC_OUTPUT(GNUmakefile Makefile.global bin/psql/Makefile)

‎src/include/config.h‎

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

910
#defineBLCKSZ8192
1011

11-
#if defined(aix)
12-
#defineTERMIOS_H_LOCATION <termios.h>
12+
/*
13+
* The following is set using configure.
14+
*/
15+
16+
/* Set to 1 if you have <termios.h> */
17+
#defineHAVE_TERMIOS_H 1
18+
19+
/* Set to 1 if you have <limits.h> */
20+
#defineHAVE_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+
#defineHAVE_ISINF 1
27+
28+
/* Set to 1 if you have tzset() */
29+
#defineHAVE_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+
# defineTERMIOS_H_LOCATION <termios.h>
1340
#else
14-
#defineTERMIOS_H_LOCATION <sys/termios.h>
41+
#defineTERMIOS_H_LOCATION <sys/termios.h>
1542
#endif
1643

17-
#if !defined(nextstep)
44+
/* Temporary: Need to change source files from USE_VALUES_H to HAVE_VALUES_H */
45+
#if defined(HAVE_VALUES_H)
1846
#defineUSE_VALUES_H
1947
#endif
2048

49+
/* Temporary: Need to change source files from USE_LIMITS_H to HAVE_LIMITS_H */
50+
#if defined(HAVE_LIMITS_H)
51+
# defineUSE_LIMITS_H
52+
#endif
53+
54+
#if !defined(HAVE_ISINF)
55+
# defineNEED_ISINF
56+
#endif
57+
58+
#if !defined(HAVE_CBRT)
59+
# defineNEED_CBRT
60+
#endif
61+
2162
#defineHAVE_MEMMOVE
2263

2364
#if defined(aix)
2465
# defineCLASS_CONFLICT
2566
# define DISABLE_XOPEN_NLS
26-
# defineNEED_ISINF
2767
# defineNEED_UNION_SEMUN
2868
# define NEED_SYS_SELECT_H
29-
# defineHAVE_TZSET
3069
# defineHAVE_ANSI_CPP
3170
# defineHAS_TEST_AND_SET
3271
typedefunsignedintslock_t;
@@ -36,7 +75,6 @@
3675
# defineUSE_POSIX_TIME
3776
# define USE_POSIX_SIGNALS
3877
# defineDISABLE_XOPEN_NLS
39-
# define NEED_ISINF
4078
# define HAS_LONG_LONG
4179
# defineNEED_UNION_SEMUN
4280
# define HAS_TEST_AND_SET
@@ -45,13 +83,11 @@
4583
#endif
4684

4785
#if defined(BSD44_derived)
48-
# defineUSE_LIMITS_H
4986
# defineUSE_POSIX_TIME
50-
# defineNEED_CBRT
5187
# defineNEED_I386_TAS_ASM
5288
# defineHAS_TEST_AND_SET
5389
# if defined(__mips__)
54-
# undef HAS_TEST_AND_SET
90+
/*# undef HAS_TEST_AND_SET */
5591
# endif
5692
typedefunsignedcharslock_t;
5793
#endif
@@ -66,9 +102,7 @@
66102
# if defined(PRE_BSDI_2_1)
67103
# defineNEED_UNION_SEMUN
68104
# endif
69-
# defineUSE_LIMITS_H
70105
# defineUSE_POSIX_TIME
71-
# defineNEED_CBRT
72106
# defineHAS_TEST_AND_SET
73107
typedefunsignedcharslock_t;
74108
#endif
@@ -83,22 +117,17 @@
83117
#if defined(hpux)
84118
# defineJMP_BUF
85119
# defineUSE_POSIX_TIME
86-
# defineHAVE_TZSET
87-
# defineNEED_CBRT
88120
# defineNEED_RINT
89121
# defineNEED_UNION_SEMUN
90122
# define HAS_TEST_AND_SET
91123
typedefstruct {intsem[4]; }slock_t;
92124
#endif
93125

94126
#if defined(i386_solaris)
95-
# defineUSE_LIMITS_H
96127
# defineUSE_POSIX_TIME
97128
# define USE_POSIX_SIGNALS
98-
# defineNEED_ISINF
99129
# defineNEED_RUSAGE
100130
# define NO_EMPTY_STMTS
101-
# defineHAVE_TZSET
102131
# defineNEED_UNION_SEMUN
103132
# define SYSV_DIRENT
104133
# defineHAS_TEST_AND_SET
@@ -108,10 +137,8 @@
108137
#if defined(irix5)
109138
# defineUSE_POSIX_TIME
110139
# define USE_POSIX_SIGNALS
111-
# defineNEED_ISINF
112140
# defineNO_EMPTY_STMTS
113141
# defineNO_VFORK
114-
# defineHAVE_TZSET
115142
# defineSYSV_DIRENT
116143
# defineHAS_TEST_AND_SET
117144
# include<abi_mutex.h>
@@ -127,8 +154,6 @@
127154
*/
128155
# defineJMP_BUF
129156
# defineUSE_POSIX_TIME
130-
# defineHAVE_TZSET
131-
# defineNEED_CBRT
132157
# defineNEED_I386_TAS_ASM
133158
# defineHAS_TEST_AND_SET
134159
typedefunsignedcharslock_t;
@@ -152,7 +177,6 @@
152177
# defineNEED_SIG_JMP
153178
# endif
154179

155-
# defineUSE_LIMITS_H
156180
# defineJMP_BUF
157181
# defineNO_WAITPID
158182
typedefstructmutexslock_t;
@@ -163,14 +187,11 @@
163187
#endif
164188

165189
#if defined(sparc_solaris)
166-
# defineUSE_LIMITS_H
167190
# defineUSE_POSIX_TIME
168191
# define USE_POSIX_SIGNALS
169-
# defineNEED_ISINF
170192
# defineNEED_RUSAGE
171193
# define NO_EMPTY_STMTS
172194
# defineUSE_POSIX_TIME
173-
# defineHAVE_TZSET
174195
# defineNEED_UNION_SEMUN
175196
# define SYSV_DIRENT
176197
# defineHAS_TEST_AND_SET
@@ -179,16 +200,14 @@ typedef unsigned char slock_t;
179200

180201
#if defined(sunos4)
181202
# defineUSE_POSIX_TIME
182-
# undef HAVE_MEMMOVE
203+
/*# undef HAVE_MEMMOVE */
183204
#endif
184205

185206
#if defined(svr4)
186207
# defineUSE_POSIX_TIME
187208
# define USE_POSIX_SIGNALS
188-
# defineNEED_ISINF
189209
# defineNEED_RUSAGE
190210
# define NO_EMPTY_STMTS
191-
# defineHAVE_TZSET
192211
# defineNEED_UNION_SEMUN
193212
# define SYSV_DIRENT
194213
#endif
@@ -200,16 +219,12 @@ typedef unsigned char slock_t;
200219
# defineUSES_WINSOCK
201220
# define NOFILE100
202221
# defineNEED_UNION_SEMUN
203-
# defineHAVE_TZSET
204-
# defineNEED_CBRT
205-
# defineNEED_ISINF
206222
# ifndefMAXPATHLEN
207223
# defineMAXPATHLEN 250
208224
# endif
209225
#endif/* WIN32 */
210226

211227
#if defined(ultrix4)
212-
# defineNEED_ISINF
213228
# defineUSE_POSIX_TIME
214229
# defineNEED_UNION_SEMUN
215230
# define NEED_STRDUP

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp