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

Commite7c767b

Browse files
committed
Try to further reduce the PORT dependencies.
Essentially, config.h now includes an 'os.h', which is created viaconfigure by linking a "port.h" file from the port directory to theinclude directory.Going to try to merge backend/port in similar ways
1 parentd557375 commite7c767b

File tree

17 files changed

+306
-310
lines changed

17 files changed

+306
-310
lines changed

‎src/configure

Lines changed: 212 additions & 166 deletions
Large diffs are not rendered by default.

‎src/configure.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ case "$host_os" in
99
esac ;;
1010
linux*) PORTNAME='linux' ;;
1111
bsdi*) PORTNAME='bsdi' ;;
12-
freebsd*|netbsd*) PORTNAME='BSD44_derived';;
12+
freebsd*|netbsd*) PORTNAME='BSD44_derived';;
1313
dgux*) PORTNAME='dgux';;
1414
aix*) PORTNAME='aix';;
1515
nextstep*) PORTNAME='nextstep';;
@@ -25,6 +25,7 @@ nextstep*) PORTNAME='nextstep';;
2525
echo ""
2626
exit;;
2727
esac
28+
AC_LINK_FILES(port/${PORTNAME}.h, include/os.h)
2829
AC_SUBST(PORTNAME)
2930
AC_SUBST(LDFLAGS)
3031
AC_SUBST(CPPFLAGS)

‎src/include/config.h.in

Lines changed: 1 addition & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -93,149 +93,7 @@
9393
* Code below this point should not require changes
9494
*/
9595

96-
#if defined(aix)
97-
# defineCLASS_CONFLICT
98-
# define DISABLE_XOPEN_NLS
99-
# defineHAVE_ANSI_CPP
100-
# defineHAS_TEST_AND_SET
101-
typedefunsignedintslock_t;
102-
#endif
103-
104-
#if defined(alpha)
105-
# defineUSE_POSIX_TIME
106-
# define USE_POSIX_SIGNALS
107-
# defineDISABLE_XOPEN_NLS
108-
# define HAS_LONG_LONG
109-
# defineHAS_TEST_AND_SET
110-
# include<sys/mman.h>/* for msemaphore */
111-
typedefmsemaphoreslock_t;
112-
#endif
113-
114-
#if defined(BSD44_derived)
115-
# defineUSE_POSIX_TIME
116-
# defineNEED_I386_TAS_ASM
117-
# defineHAS_TEST_AND_SET
118-
# if defined(__mips__)
119-
/* # undef HAS_TEST_AND_SET */
120-
# endif
121-
typedefunsignedcharslock_t;
122-
#endif
123-
124-
#if defined(bsdi)
125-
# if defined(i386)
126-
# defineNEED_I386_TAS_ASM
127-
# endif
128-
# if defined(sparc)
129-
# defineNEED_SPARC_TAS_ASM
130-
# endif
131-
# defineUSE_POSIX_TIME
132-
# defineHAS_TEST_AND_SET
133-
typedefunsignedcharslock_t;
134-
#endif
135-
136-
137-
#if defined(dgux)
138-
# defineLINUX_ELF
139-
# defineUSE_POSIX_SIGNALS
140-
#endif
141-
142-
#if defined(hpux)
143-
# defineJMP_BUF
144-
# defineUSE_POSIX_TIME
145-
# defineHAS_TEST_AND_SET
146-
typedefstruct {intsem[4]; }slock_t;
147-
#endif
148-
149-
#if defined(i386_solaris)
150-
# defineUSE_POSIX_TIME
151-
# define USE_POSIX_SIGNALS
152-
# defineNO_EMPTY_STMTS
153-
# defineSYSV_DIRENT
154-
# defineHAS_TEST_AND_SET
155-
typedefunsignedcharslock_t;
156-
#endif
157-
158-
#if defined(irix5)
159-
# defineUSE_POSIX_TIME
160-
# define USE_POSIX_SIGNALS
161-
# defineNO_EMPTY_STMTS
162-
# defineSYSV_DIRENT
163-
# defineHAS_TEST_AND_SET
164-
# include<abi_mutex.h>
165-
typedefabilock_tslock_t;
166-
#endif
167-
168-
#if defined(linux)
169-
/* __USE_POSIX, __USE_BSD, and __USE_BSD_SIGNAL used to be defined either
170-
here or with -D compile options, but __ macros should be set and used by C
171-
library macros, not Postgres code. __USE_POSIX is set by features.h,
172-
__USE_BSD is set by bsd/signal.h, and __USE_BSD_SIGNAL appears not to
173-
be used.
174-
*/
175-
# defineJMP_BUF
176-
# defineUSE_POSIX_TIME
177-
# if !defined(PPC)
178-
# defineNEED_I386_TAS_ASM
179-
# defineHAS_TEST_AND_SET
180-
typedefunsignedcharslock_t;
181-
# endif
182-
#endif
183-
184-
#if defined(nextstep)
185-
# include<sys/ioctl.h>
186-
# if defined(__STRICT_ANSI__)
187-
# defineisascii(c) ((unsigned)(c)<=0177)
188-
# endif
189-
externchar*strdup (constchar*string);
190-
# ifndef_POSIX_SOURCE
191-
typedefunsigned shortmode_t;
192-
typedefintsigset_t;
193-
# defineSIG_BLOCK00
194-
# defineSIG_UNBLOCK01
195-
# defineSIG_SETMASK02
196-
# defineNEED_SIG_JMP
197-
# endif
198-
199-
# defineJMP_BUF
200-
# defineNO_WAITPID
201-
typedefstructmutexslock_t;
202-
#endif
203-
204-
#if defined(sparc_solaris)
205-
# defineUSE_POSIX_TIME
206-
# define USE_POSIX_SIGNALS
207-
# defineNO_EMPTY_STMTS
208-
# defineSYSV_DIRENT
209-
# defineHAS_TEST_AND_SET
210-
typedefunsignedcharslock_t;
211-
#endif
212-
213-
#if defined(sunos4)
214-
# defineUSE_POSIX_TIME
215-
#endif
216-
217-
#if defined(svr4)
218-
# defineUSE_POSIX_TIME
219-
# define USE_POSIX_SIGNALS
220-
# defineNO_EMPTY_STMTS
221-
# defineSYSV_DIRENT
222-
#endif
223-
224-
#if defined(win32)
225-
# defineJMP_BUF
226-
# defineNEED_SIG_JMP
227-
# defineNO_UNISTD_H
228-
# defineUSES_WINSOCK
229-
# define NOFILE100
230-
# ifndefMAXPATHLEN
231-
# defineMAXPATHLEN 250
232-
# endif
233-
#endif/* WIN32 */
234-
235-
#if defined(ultrix4)
236-
# defineUSE_POSIX_TIME
237-
# defineNEED_STRDUP
238-
#endif
96+
#include"os.h"
23997

24098
/* This patch changes the behavior of aclcheck for groups. Currently an user
24199
* can access a table only if he has the required permission for ALL the groups

‎src/port/aix.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# defineCLASS_CONFLICT
2+
# define DISABLE_XOPEN_NLS
3+
# defineHAVE_ANSI_CPP
4+
# defineHAS_TEST_AND_SET
5+
typedefunsignedintslock_t;

‎src/port/alpha.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# defineUSE_POSIX_TIME
2+
# define USE_POSIX_SIGNALS
3+
# defineDISABLE_XOPEN_NLS
4+
# define HAS_LONG_LONG
5+
# defineHAS_TEST_AND_SET
6+
# include<sys/mman.h>/* for msemaphore */
7+
typedefmsemaphoreslock_t;

‎src/port/bsdi.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# if defined(i386)
2+
# defineNEED_I386_TAS_ASM
3+
# endif
4+
# if defined(sparc)
5+
# defineNEED_SPARC_TAS_ASM
6+
# endif
7+
# defineUSE_POSIX_TIME
8+
# defineHAS_TEST_AND_SET
9+
typedefunsignedcharslock_t;

‎src/port/dgux.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# defineLINUX_ELF
2+
# defineUSE_POSIX_SIGNALS

‎src/port/hpux.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# defineJMP_BUF
2+
# defineUSE_POSIX_TIME
3+
# defineHAS_TEST_AND_SET
4+
typedefstruct {intsem[4]; }slock_t;

‎src/port/i386_solaris.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# defineUSE_POSIX_TIME
2+
# define USE_POSIX_SIGNALS
3+
# defineNO_EMPTY_STMTS
4+
# defineSYSV_DIRENT
5+
# defineHAS_TEST_AND_SET
6+
typedefunsignedcharslock_t;

‎src/port/irix5.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# defineUSE_POSIX_TIME
2+
# define USE_POSIX_SIGNALS
3+
# defineNO_EMPTY_STMTS
4+
# defineSYSV_DIRENT
5+
# defineHAS_TEST_AND_SET
6+
# include<abi_mutex.h>
7+
typedefabilock_tslock_t;

‎src/port/linux.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/* __USE_POSIX, __USE_BSD, and __USE_BSD_SIGNAL used to be defined either
2+
here or with -D compile options, but __ macros should be set and used by C
3+
library macros, not Postgres code. __USE_POSIX is set by features.h,
4+
__USE_BSD is set by bsd/signal.h, and __USE_BSD_SIGNAL appears not to
5+
be used.
6+
*/
7+
# defineJMP_BUF
8+
# defineUSE_POSIX_TIME
9+
# if !defined(PPC)
10+
# defineNEED_I386_TAS_ASM
11+
# defineHAS_TEST_AND_SET
12+
typedefunsignedcharslock_t;
13+
# endif

‎src/port/nextstep.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# include<sys/ioctl.h>
2+
# if defined(__STRICT_ANSI__)
3+
# defineisascii(c) ((unsigned)(c)<=0177)
4+
# endif
5+
externchar*strdup (constchar*string);
6+
# ifndef_POSIX_SOURCE
7+
typedefunsigned shortmode_t;
8+
typedefintsigset_t;
9+
# defineSIG_BLOCK00
10+
# defineSIG_UNBLOCK01
11+
# defineSIG_SETMASK02
12+
# defineNEED_SIG_JMP
13+
# endif
14+
15+
# defineJMP_BUF
16+
# defineNO_WAITPID
17+
typedefstructmutexslock_t;

‎src/port/sparc_solaris.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# defineUSE_POSIX_TIME
2+
# define USE_POSIX_SIGNALS
3+
# defineNO_EMPTY_STMTS
4+
# defineSYSV_DIRENT
5+
# defineHAS_TEST_AND_SET
6+
typedefunsignedcharslock_t;

‎src/port/sunos4.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# defineUSE_POSIX_TIME

‎src/port/svr4.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# defineUSE_POSIX_TIME
2+
# define USE_POSIX_SIGNALS
3+
# defineNO_EMPTY_STMTS
4+
# defineSYSV_DIRENT

‎src/port/ultrix4.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# defineUSE_POSIX_TIME
2+
# defineNEED_STRDUP

‎src/port/win32.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# defineJMP_BUF
2+
# defineNEED_SIG_JMP
3+
# defineNO_UNISTD_H
4+
# defineUSES_WINSOCK
5+
# define NOFILE100
6+
# ifndefMAXPATHLEN
7+
# defineMAXPATHLEN 250
8+
# endif

0 commit comments

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