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

Commit0a16069

Browse files
committed
Convert NEED_{RINT,CBRT,ISINF} to HAVE_* in prepration for configure...
1 parent3ffd569 commit0a16069

File tree

3 files changed

+40
-40
lines changed

3 files changed

+40
-40
lines changed

‎src/backend/port/win32/nt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ struct sembuf
2626
};
2727

2828
#defineUSE_POSIX_TIME
29-
#defineNEED_RINT
29+
#undef HAVE_RINT
3030

3131
#defineMAXHOSTNAMELEN12/* where is the official definition of this? */
3232
#defineMAXPATHLEN _MAX_PATH/* in winsock.h */

‎src/backend/utils/adt/float.c

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.9 1997/01/1817:36:02 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.10 1997/01/24 18:17:06 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -68,28 +68,28 @@
6868
externdoubleatof(constchar*p);
6969
#endif
7070

71-
#ifdefNEED_CBRT
71+
#ifndefHAVE_CBRT
7272
# definecbrt my_cbrt
7373
staticdoublecbrt(doublex);
74-
#else/* NEED_CBRT */
75-
# if !defined(next)
74+
#else
75+
# if !defined(nextstep)
7676
externdoublecbrt(doublex);
7777
# endif
78-
#endif/* NEED_CBRT */
79-
80-
#ifdefNEED_RINT
81-
#definerint my_rint
82-
staticdoublerint(doublex);
83-
#else/* NEED_RINT */
84-
externdoublerint(doublex);
85-
#endif/* NEED_RINT */
86-
87-
#ifdefNEED_ISINF
88-
#defineisinf my_isinf
89-
staticintisinf(doublex);
90-
#else/* NEED_ISINF */
91-
externintisinf(doublex);
92-
#endif/* NEED_ISINF */
78+
#endif
79+
80+
#ifndefHAVE_RINT
81+
#definerint my_rint
82+
staticdoublerint(doublex);
83+
#else
84+
externdoublerint(doublex);
85+
#endif
86+
87+
#ifndefHAVE_ISINF
88+
#defineisinf my_isinf
89+
staticintisinf(doublex);
90+
#else
91+
externintisinf(doublex);
92+
#endif
9393

9494
#endif
9595
/* ========== USER I/O ROUTINES ========== */
@@ -1125,7 +1125,7 @@ long float84ge(float64 arg1, float32 arg2)
11251125

11261126
/* From "fdlibm" @ netlib.att.com */
11271127

1128-
#ifdefNEED_RINT
1128+
#ifndefHAVE_RINT
11291129

11301130
/* @(#)s_rint.c 5.1 93/09/24 */
11311131
/*
@@ -1211,9 +1211,9 @@ static double rint(double x)
12111211
returnw-TWO52[sx];
12121212
}
12131213

1214-
#endif/*NEED_RINT */
1214+
#endif/*!HAVE_RINT */
12151215

1216-
#ifdefNEED_CBRT
1216+
#ifndefHAVE_CBRT
12171217

12181218
static
12191219
double
@@ -1226,9 +1226,9 @@ double x;
12261226
return(isneg ?-tmpres :tmpres);
12271227
}
12281228

1229-
#endif/*NEED_CBRT */
1229+
#endif/*!HAVE_CBRT */
12301230

1231-
#ifdefNEED_ISINF
1231+
#ifndefHAVE_ISINF
12321232

12331233
#if defined(aix)
12341234
#ifdefCLASS_CONFLICT
@@ -1318,4 +1318,4 @@ double d;
13181318
}
13191319
#endif/* irix5 */
13201320

1321-
#endif/*NEED_ISINF */
1321+
#endif/*!HAVE_ISINF */

‎src/include/config.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# undef HAVE_TERMIOS_H
1717
# defineCLASS_CONFLICT
1818
# define DISABLE_XOPEN_NLS
19-
# defineNEED_ISINF
19+
# defineHAVE_ISINF
2020
# defineNEED_UNION_SEMUN
2121
# define NEED_SYS_SELECT_H
2222
# defineHAVE_TZSET
@@ -29,7 +29,7 @@
2929
# defineUSE_POSIX_TIME
3030
# define USE_POSIX_SIGNALS
3131
# defineDISABLE_XOPEN_NLS
32-
# defineNEED_ISINF
32+
# defineHAVE_ISINF
3333
# defineHAS_LONG_LONG
3434
# defineNEED_UNION_SEMUN
3535
# define HAS_TEST_AND_SET
@@ -40,7 +40,7 @@
4040
#if defined(BSD44_derived)
4141
# defineHAVE_LIMITS_H
4242
# defineUSE_POSIX_TIME
43-
# defineNEED_CBRT
43+
# defineHAVE_CBRT
4444
# defineNEED_I386_TAS_ASM
4545
# defineHAS_TEST_AND_SET
4646
# if defined(__mips__)
@@ -61,7 +61,7 @@
6161
# endif
6262
# defineHAVE_LIMITS_H
6363
# defineUSE_POSIX_TIME
64-
# defineNEED_CBRT
64+
# defineHAVE_CBRT
6565
# defineHAS_TEST_AND_SET
6666
typedefunsignedcharslock_t;
6767
#endif
@@ -77,8 +77,8 @@
7777
# defineJMP_BUF
7878
# defineUSE_POSIX_TIME
7979
# defineHAVE_TZSET
80-
# defineNEED_CBRT
81-
# defineNEED_RINT
80+
# defineHAVE_CBRT
81+
# defineHAVE_RINT
8282
# defineNEED_UNION_SEMUN
8383
# define HAS_TEST_AND_SET
8484
typedefstruct {intsem[4]; }slock_t;
@@ -88,7 +88,7 @@
8888
# defineHAVE_LIMITS_H
8989
# defineUSE_POSIX_TIME
9090
# define USE_POSIX_SIGNALS
91-
# defineNEED_ISINF
91+
# defineHAVE_ISINF
9292
# define NEED_RUSAGE
9393
# defineNO_EMPTY_STMTS
9494
# defineHAVE_TZSET
@@ -101,7 +101,7 @@
101101
#if defined(irix5)
102102
# defineUSE_POSIX_TIME
103103
# define USE_POSIX_SIGNALS
104-
# defineNEED_ISINF
104+
# defineHAVE_ISINF
105105
# define NO_EMPTY_STMTS
106106
# defineNO_VFORK
107107
# defineHAVE_TZSET
@@ -121,7 +121,7 @@
121121
# defineJMP_BUF
122122
# defineUSE_POSIX_TIME
123123
# defineHAVE_TZSET
124-
# defineNEED_CBRT
124+
# defineHAVE_CBRT
125125
# defineNEED_I386_TAS_ASM
126126
# defineHAS_TEST_AND_SET
127127
typedefunsignedcharslock_t;
@@ -160,7 +160,7 @@
160160
# defineHAVE_LIMITS_H
161161
# defineUSE_POSIX_TIME
162162
# define USE_POSIX_SIGNALS
163-
# defineNEED_ISINF
163+
# defineHAVE_ISINF
164164
# define NEED_RUSAGE
165165
# defineNO_EMPTY_STMTS
166166
# defineUSE_POSIX_TIME
@@ -179,7 +179,7 @@ typedef unsigned char slock_t;
179179
#if defined(svr4)
180180
# defineUSE_POSIX_TIME
181181
# define USE_POSIX_SIGNALS
182-
# defineNEED_ISINF
182+
# defineHAVE_ISINF
183183
# define NEED_RUSAGE
184184
# defineNO_EMPTY_STMTS
185185
# defineHAVE_TZSET
@@ -195,15 +195,15 @@ typedef unsigned char slock_t;
195195
# define NOFILE100
196196
# defineNEED_UNION_SEMUN
197197
# defineHAVE_TZSET
198-
# defineNEED_CBRT
199-
# defineNEED_ISINF
198+
# defineHAVE_CBRT
199+
# defineHAVE_ISINF
200200
# ifndefMAXPATHLEN
201201
# defineMAXPATHLEN 250
202202
# endif
203203
#endif/* WIN32 */
204204

205205
#if defined(ultrix4)
206-
# defineNEED_ISINF
206+
# defineHAVE_ISINF
207207
# define USE_POSIX_TIME
208208
# defineNEED_UNION_SEMUN
209209
# define NEED_STRDUP

0 commit comments

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