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

Commit4df1a41

Browse files
committed
more removals of PORTNAME_*
1 parentbdd0741 commit4df1a41

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

‎src/backend/storage/file/fd.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 1994, Regents of the University of California
77
*
88
* IDENTIFICATION
9-
* $Id: fd.c,v 1.5 1996/09/22 01:30:52 scrappy Exp $
9+
* $Id: fd.c,v 1.6 1996/10/31 10:19:59 scrappy Exp $
1010
*
1111
* NOTES:
1212
*
@@ -49,7 +49,7 @@
4949
#include"miscadmin.h"/* for DataDir */
5050
#include"utils/palloc.h"
5151

52-
#ifdefPORTNAME_sparc
52+
#ifdefsparc
5353
/*
5454
* the SunOS 4 NOFILE is a lie, because the default limit is *not* the
5555
* maximum number of file descriptors you can have open.
@@ -60,13 +60,13 @@
6060
#include<sys/user.h>
6161
#undef NOFILE
6262
#defineNOFILE NOFILE_IN_U
63-
#endif/*PORTNAME_sparc */
63+
#endif/*sparc */
6464

65-
#if defined(PORTNAME_sparc_solaris)|| defined(PORTNAME_i386_solaris)
65+
#if defined(sparc_solaris)|| defined(i386_solaris)
6666
#include<sys/user.h>
6767
#undef NOFILE
6868
#defineNOFILE 64
69-
#endif/*PORTNAME_sparc_solaris ||PORTNAME_i386_solaris */
69+
#endif/*sparc_solaris ||i386_solaris */
7070

7171
/*
7272
* Problem: Postgres does a system(ld...) to do dynamic loading. This

‎src/backend/storage/ipc/ipc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.4 1996/08/14 05:01:53 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.5 1996/10/31 10:20:06 scrappy Exp $
1111
*
1212
* NOTES
1313
*
@@ -41,7 +41,7 @@
4141
#include"utils/memutils.h"
4242
#include"utils/elog.h"
4343

44-
#if defined(PORTNAME_bsd44)
44+
#if defined(bsd44)
4545
intUsePrivateMemory=1;
4646
#else
4747
intUsePrivateMemory=0;

‎src/backend/storage/ipc/s_lock.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.4 1996/07/22 23:00:03 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.5 1996/10/31 10:20:09 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -45,7 +45,7 @@
4545

4646
#if defined(HAS_TEST_AND_SET)
4747

48-
#if defined (PORTNAME_next)
48+
#if defined (next)
4949
/*
5050
* NEXTSTEP (mach)
5151
* slock_t is defined as a struct mutex.
@@ -74,11 +74,11 @@ int
7474
return (lock->lock==0);
7575
}
7676

77-
#endif/*PORTNAME_next */
77+
#endif/*next */
7878

7979

8080

81-
#if defined(PORTNAME_irix5)
81+
#if defined(irix5)
8282
/*
8383
* SGI IRIX 5
8484
* slock_t is defined as a struct abilock_t, which has a single unsigned long
@@ -115,7 +115,7 @@ S_LOCK_FREE(slock_t *lock)
115115
return(stat_lock(lock)==UNLOCKED);
116116
}
117117

118-
#endif/*PORTNAME_irix5 */
118+
#endif/*irix5 */
119119

120120

121121
/*
@@ -125,7 +125,7 @@ S_LOCK_FREE(slock_t *lock)
125125
* (see storage/ipc.h).
126126
*/
127127

128-
#if defined(PORTNAME_alpha)
128+
#if defined(alpha)
129129

130130
void
131131
S_LOCK(slock_t*lock)
@@ -152,14 +152,14 @@ S_LOCK_FREE(slock_t *lock)
152152
return(lock->msem_state ?0 :1);
153153
}
154154

155-
#endif/*PORTNAME_alpha */
155+
#endif/*alpha */
156156

157157
/*
158158
* Solaris 2
159159
*/
160160

161-
#if defined(PORTNAME_i386_solaris)|| \
162-
defined(PORTNAME_sparc_solaris)
161+
#if defined(i386_solaris)|| \
162+
defined(sparc_solaris)
163163

164164
/* for xxxxx_solaris, this is defined in port/.../tas.s */
165165
externinttas(slock_t*lock);
@@ -183,7 +183,7 @@ S_INIT_LOCK(slock_t *lock)
183183
S_UNLOCK(lock);
184184
}
185185

186-
#endif/*PORTNAME_i86pc_solaris ||PORTNAME_sparc_solaris */
186+
#endif/*i86pc_solaris ||sparc_solaris */
187187

188188
/*
189189
* AIX (POWER)
@@ -192,7 +192,7 @@ S_INIT_LOCK(slock_t *lock)
192192
* (see storage/ipc.h).
193193
*/
194194

195-
#if defined(PORTNAME_aix)
195+
#if defined(aix)
196196

197197
void
198198
S_LOCK(slock_t*lock)
@@ -213,7 +213,7 @@ S_INIT_LOCK(slock_t *lock)
213213
S_UNLOCK(lock);
214214
}
215215

216-
#endif/*PORTNAME_aix */
216+
#endif/*aix */
217217

218218
/*
219219
* HP-UX (PA-RISC)
@@ -222,7 +222,7 @@ S_INIT_LOCK(slock_t *lock)
222222
* (see storage/ipc.h).
223223
*/
224224

225-
#if defined(PORTNAME_hpux)
225+
#if defined(hpux)
226226

227227
/* defined in port/.../tas.s */
228228
externinttas(slock_t*lock);
@@ -260,7 +260,7 @@ S_LOCK_FREE(slock_t *lock)
260260
return(*lock_word!=0);
261261
}
262262

263-
#endif/*PORTNAME_hpux */
263+
#endif/*hpux */
264264

265265
/*
266266
* sun3
@@ -313,7 +313,7 @@ tas_dummy()
313313
* SPARC (SunOS 4)
314314
*/
315315

316-
#if defined(PORTNAME_sparc)
316+
#if defined(sparc)
317317

318318
/* if we're using -ansi w/ gcc, use __asm__ instead of asm */
319319
#if defined(__STRICT_ANSI__)
@@ -375,16 +375,16 @@ S_INIT_LOCK(unsigned char *addr)
375375
*addr=0;
376376
}
377377

378-
#endif/*PORTNAME_sparc */
378+
#endif/*sparc */
379379

380380
/*
381381
* Linux and friends
382382
*/
383383

384-
#if defined(PORTNAME_BSD44_derived)|| \
385-
defined(PORTNAME_bsdi)|| \
386-
defined(PORTNAME_bsdi_2_1)|| \
387-
defined(PORTNAME_linux)
384+
#if defined(BSD44_derived)|| \
385+
defined(bsdi)|| \
386+
defined(bsdi_2_1)|| \
387+
defined(linux)
388388

389389
int
390390
tas(slock_t*m)

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp