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

Commit7e42f48

Browse files
committed
Removed PORTNAME_. Use OS version only.
1 parent510ebf7 commit7e42f48

File tree

17 files changed

+78
-80
lines changed

17 files changed

+78
-80
lines changed

‎src/Makefile.global

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/Attic/Makefile.global,v 1.51 1996/11/03 06:54:10 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.52 1996/11/04 03:59:09 momjian Exp $
1111
#
1212
# NOTES
1313
# This is seen by any Makefiles that include mk/postgres.mk. To
@@ -888,7 +888,7 @@ ifdef PROFILE
888888
endif
889889

890890
# Globally pass PORTNAME
891-
CFLAGS+= -DPORTNAME_$(PORTNAME) -D$(PORTNAME)
891+
CFLAGS+= -D$(PORTNAME)
892892

893893
# include port-specific flags
894894
CFLAGS+= $(CFLAGS_BE)

‎src/backend/utils/Gen_fmgrtab.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
#
1010
# IDENTIFICATION
11-
# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.4 1996/10/31 07:37:57 scrappy Exp $
11+
# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.5 1996/11/04 03:59:18 momjian Exp $
1212
#
1313
# NOTES
1414
# Passes any -D options on to cpp prior to generating the list
@@ -81,7 +81,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf
8181
*
8282
* Copyright (c) 1994, Regents of the University of California
8383
*
84-
*$Id: Gen_fmgrtab.sh,v 1.4 1996/10/31 07:37:57 scrappy Exp $
84+
*$Id: Gen_fmgrtab.sh,v 1.5 1996/11/04 03:59:18 momjian Exp $
8585
*
8686
* NOTES
8787
*******************************
@@ -173,7 +173,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
173173
*
174174
*
175175
* IDENTIFICATION
176-
*$Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.4 1996/10/31 07:37:57 scrappy Exp $
176+
*$Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.5 1996/11/04 03:59:18 momjian Exp $
177177
*
178178
* NOTES
179179
*
@@ -193,9 +193,9 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
193193
#ifdef WIN32
194194
#include <limits.h>
195195
#else
196-
# if defined(PORTNAME_BSD44_derived) ||\
197-
defined(PORTNAME_bsdi) ||\
198-
defined(PORTNAME_bsdi_2_1)
196+
# if defined(BSD44_derived) ||\
197+
defined(bsdi) ||\
198+
defined(bsdi_2_1)
199199
# include <machine/limits.h>
200200
# define MAXINTINT_MAX
201201
# else

‎src/bin/monitor/monitor.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/bin/monitor/Attic/monitor.c,v 1.5 1996/07/23 03:03:24 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/bin/monitor/Attic/monitor.c,v 1.6 1996/11/04 03:59:26 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -20,7 +20,7 @@
2020
#ifndefWIN32
2121
#include<unistd.h>
2222
#endif
23-
#if defined(PORTNAME_sparc_solaris)|| defined(PORTNAME_i386_solaris)
23+
#if defined(sparc_solaris)|| defined(i386_solaris)
2424
#include<netdb.h>/* for MAXHOSTNAMELEN on some */
2525
#endif
2626
#include<sys/types.h>

‎src/bin/pg4_dump/common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include<stdlib.h>
1717
#include<stdio.h>
1818
#include<sys/param.h>/* for MAXHOSTNAMELEN on most */
19-
#if defined(PORTNAME_sparc_solaris)|| defined(PORTNAME_i386_solaris)
19+
#if defined(sparc_solaris)|| defined(i386_solaris)
2020
#include<netdb.h>/* for MAXHOSTNAMELEN on some */
2121
#endif
2222

‎src/bin/pg_dump/common.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/bin/pg_dump/common.c,v 1.6 1996/10/07 03:30:31 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.7 1996/11/04 03:59:53 momjian Exp $
1111
*
1212
* Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
1313
*
@@ -23,7 +23,7 @@
2323
#include<stdio.h>
2424
#include<string.h>
2525
#include<sys/param.h>/* for MAXHOSTNAMELEN on most */
26-
#ifdefPORTNAME_sparc_solaris
26+
#ifdefsparc_solaris
2727
#include<netdb.h>/* for MAXHOSTNAMELEN on some */
2828
#endif
2929

‎src/bin/pg_dump/pg_dump.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*
2121
*
2222
* IDENTIFICATION
23-
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.11 1996/10/07 21:17:01 scrappy Exp $
23+
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.12 1996/11/04 04:00:02 momjian Exp $
2424
*
2525
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
2626
*
@@ -46,7 +46,7 @@
4646
#include<stdio.h>
4747
#include<string.h>
4848
#include<sys/param.h>/* for MAXHOSTNAMELEN on most */
49-
#ifdefPORTNAME_sparc_solaris
49+
#ifdefsparc_solaris
5050
#include<netdb.h>/* for MAXHOSTNAMELEN on some */
5151
#endif
5252

‎src/include/c.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: c.h,v 1.1 1996/10/31 07:10:12 scrappy Exp $
10+
* $Id: c.h,v 1.2 1996/11/04 04:00:19 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -737,11 +737,11 @@ extern char *form(char *fmt, ...);
737737
* ----------------------------------------------------------------
738738
*/
739739

740-
#if defined(PORTNAME_hpux)
740+
#if defined(hpux)
741741
#include"port/hpux/fixade.h"/* for 8.07 unaligned access fixup */
742-
#endif/*PORTNAME_hpux */
742+
#endif/*hpux */
743743

744-
#if defined(PORTNAME_sparc)
744+
#if defined(sparc)
745745
#definememmove(d,s,l)bcopy(s, d, l)
746746
#endif
747747

‎src/include/storage/buf_internals.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: buf_internals.h,v 1.3 1996/11/01 03:36:13 momjian Exp $
9+
* $Id: buf_internals.h,v 1.4 1996/11/04 04:00:24 momjian Exp $
1010
*
1111
* NOTE
1212
*If BUFFERPAGE0 is defined, then 0 will be used as a
@@ -137,36 +137,36 @@ struct sbufdesc {
137137

138138
/* NO spinlock */
139139

140-
#if defined(PORTNAME_ultrix4)
140+
#if defined(ultrix4)
141141
charsb_pad[60];/* no slock_t */
142142
#endif/* mips */
143143

144144
/* HAS_TEST_AND_SET -- platform dependent size */
145145

146-
#if defined(PORTNAME_aix)
146+
#if defined(aix)
147147
charsb_pad[44];/* typedef unsigned int slock_t; */
148148
#endif/* aix */
149-
#if defined(PORTNAME_alpha)
149+
#if defined(alpha)
150150
charsb_pad[40];/* typedef msemaphore slock_t; */
151151
#endif/* alpha */
152-
#if defined(PORTNAME_hpux)
152+
#if defined(hpux)
153153
charsb_pad[44];/* typedef struct { int sem[4]; } slock_t; */
154154
#endif/* hpux */
155-
#if defined(PORTNAME_irix5)
155+
#if defined(irix5)
156156
charsb_pad[44];/* typedef abilock_t slock_t; */
157157
#endif/* irix5 */
158-
#if defined(PORTNAME_next)
158+
#if defined(next)
159159
charsb_pad[56];/* typedef struct mutex slock_t; */
160160
#endif/* next */
161161

162162
/* HAS_TEST_AND_SET -- default 1 byte spinlock */
163163

164-
#if defined(PORTNAME_BSD44_derived)|| \
165-
defined(PORTNAME_bsdi)|| \
166-
defined(PORTNAME_i386_solaris)|| \
167-
defined(PORTNAME_linux)|| \
168-
defined(PORTNAME_sparc)|| \
169-
defined(PORTNAME_sparc_solaris)
164+
#if defined(BSD44_derived)|| \
165+
defined(bsdi)|| \
166+
defined(i386_solaris)|| \
167+
defined(linux)|| \
168+
defined(sparc)|| \
169+
defined(sparc_solaris)
170170
charsb_pad[56];/* has slock_t */
171171
#endif/* 1 byte slock_t */
172172
};

‎src/include/storage/ipc.h

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: ipc.h,v 1.8 1996/11/01 09:31:12 scrappy Exp $
9+
* $Id: ipc.h,v 1.9 1996/11/04 04:00:28 momjian Exp $
1010
*
1111
* NOTES
1212
* This file is very architecture-specific. This stuff should actually
@@ -31,51 +31,51 @@
3131
* we may in fact have different architectures, thus make the tests
3232
* based on portnames somewhat misleading.
3333
*/
34-
#if defined(PORTNAME_aix)|| \
35-
defined(PORTNAME_alpha)|| \
36-
defined(PORTNAME_BSD44_derived)|| \
37-
defined(PORTNAME_bsdi)|| \
38-
defined(PORTNAME_hpux)|| \
39-
defined(PORTNAME_i386_solaris)|| \
40-
defined(PORTNAME_irix5)|| \
41-
defined(PORTNAME_linux)|| \
42-
defined(PORTNAME_next)|| \
43-
defined(PORTNAME_sparc)|| \
44-
defined(PORTNAME_sparc_solaris)
34+
#if defined(aix)|| \
35+
defined(alpha)|| \
36+
defined(BSD44_derived)|| \
37+
defined(bsdi)|| \
38+
defined(hpux)|| \
39+
defined(i386_solaris)|| \
40+
defined(irix5)|| \
41+
defined(linux)|| \
42+
defined(next)|| \
43+
defined(sparc)|| \
44+
defined(sparc_solaris)
4545
#defineHAS_TEST_AND_SET
4646
#endif
4747

48-
#if defined(PORTNAME_BSD44_derived)&& defined(__mips__)
48+
#if defined(BSD44_derived)&& defined(__mips__)
4949
#undef HAS_TEST_AND_SET
5050
#endif
5151

5252
#if defined(HAS_TEST_AND_SET)
5353

54-
#if defined(PORTNAME_aix)
54+
#if defined(aix)
5555
/*
5656
* The AIX C library has the cs(3) builtin for compare-and-set that
5757
* operates on ints.
5858
*/
5959
typedefunsignedintslock_t;
6060
#else/* aix */
6161

62-
#if defined(PORTNAME_alpha)
62+
#if defined(alpha)
6363
typedefmsemaphoreslock_t;
6464
#else/* alpha */
6565

66-
#if defined(PORTNAME_hpux)
66+
#if defined(hpux)
6767
/*
6868
* The PA-RISC "semaphore" for the LDWCX instruction is 4 bytes aligned
6969
* to a 16-byte boundary.
7070
*/
7171
typedefstruct {intsem[4]; }slock_t;
7272
#else/* hpux */
7373

74-
#if defined(PORTNAME_irix5)
74+
#if defined(irix5)
7575
typedefabilock_tslock_t;
7676
#else/* irix5 */
7777

78-
#if defined(PORTNAME_next)
78+
#if defined(next)
7979
/*
8080
* Use Mach mutex routines since these are, in effect, test-and-set
8181
* spinlocks.
@@ -99,10 +99,10 @@ extern void S_LOCK(slock_t *lock);
9999
externvoidS_UNLOCK(slock_t*lock);
100100
externvoidS_INIT_LOCK(slock_t*lock);
101101

102-
#if defined(PORTNAME_alpha)|| \
103-
defined(PORTNAME_hpux)|| \
104-
defined(PORTNAME_irix5)|| \
105-
defined(PORTNAME_next)
102+
#if defined(alpha)|| \
103+
defined(hpux)|| \
104+
defined(irix5)|| \
105+
defined(next)
106106
externintS_LOCK_FREE(slock_t*lock);
107107
#else
108108
#defineS_LOCK_FREE(lock)((*lock) == 0)

‎src/include/utils/array.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
* Copyright (c) 1994, Regents of the University of California
1212
*
13-
* $Id: array.h,v 1.1 1996/08/28 01:58:42 scrappy Exp $
13+
* $Id: array.h,v 1.2 1996/11/04 04:00:36 momjian Exp $
1414
*
1515
* NOTES
1616
* XXX the data array should be LONGALIGN'd -- notice that the array
@@ -97,11 +97,11 @@ typedef struct {
9797
*------------------------------------------------------------------------
9898
*/
9999

100-
/* #if defined(PORTNAME_irix5) */
100+
/* #if defined(irix5) */
101101
/* #define RETURN_NULL {*isNull = true; return(0); }*/
102-
/* #else*//*PORTNAME_irix5 */
102+
/* #else*//*irix5 */
103103
#defineRETURN_NULL {*isNull = true; return(0); }
104-
/* #endif *//*PORTNAME_irix5 */
104+
/* #endif *//*irix5 */
105105
#defineNAME_LEN 30
106106
#defineMAX_BUFF_SIZE (1 << 13)
107107

‎src/include/utils/builtins.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: builtins.h,v 1.3 1996/11/03 12:13:34 scrappy Exp $
9+
* $Id: builtins.h,v 1.4 1996/11/04 04:00:43 momjian Exp $
1010
*
1111
* NOTES
1212
* This should normally only be included by fmgr.h.
@@ -170,9 +170,9 @@ extern uint32 NameComputeLength(Name name);
170170

171171
/* numutils.c */
172172
/* XXX hack. HP-UX has a ltoa (with different arguments) already. */
173-
#ifdefPORTNAME_hpux
173+
#ifdefhpux
174174
#defineltoa pg_ltoa
175-
#endif/*PORTNAME_hpux */
175+
#endif/*hpux */
176176
externint32pg_atoi(char*s,intsize,intc);
177177
externvoiditoa(inti,char*a);
178178
externvoidltoa(int32l,char*a);

‎src/include/utils/exc.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: exc.h,v 1.2 1996/10/31 09:51:13 scrappy Exp $
9+
* $Id: exc.h,v 1.3 1996/11/04 04:00:47 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -22,9 +22,9 @@ extern Index ExcLineNumber;
2222
* ExcMessage and Exception are now defined in c.h
2323
*/
2424

25-
#if defined(PORTNAME_hpux)|| \
26-
defined(PORTNAME_linux)|| \
27-
defined(PORTNAME_next)|| \
25+
#if defined(hpux)|| \
26+
defined(linux)|| \
27+
defined(next)|| \
2828
defined(WIN32)
2929
typedefjmp_bufExcContext;
3030
#else

‎src/include/utils/memutils.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
* Copyright (c) 1994, Regents of the University of California
1717
*
18-
* $Id: memutils.h,v 1.3 1996/11/03 12:13:35 scrappy Exp $
18+
* $Id: memutils.h,v 1.4 1996/11/04 04:00:48 momjian Exp $
1919
*
2020
* NOTES
2121
* some of the information in this file will be moved to
@@ -67,7 +67,7 @@ s...)
6767
*/
6868
#if defined(sun)&& ! defined(sparc)
6969
#defineLONGALIGN(LEN)SHORTALIGN(LEN)
70-
#elif defined (PORTNAME_alpha)
70+
#elif defined (alpha)
7171
#defineLONGALIGN(LEN)\
7272
(((long)(LEN) + (sizeof (int) - 1)) & ~(sizeof (int) -1))
7373
#else

0 commit comments

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