Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit df6a9e6

Browse files
scrappyscrappy
committed
more removal of PORTNAME_*
1 parent 4df1a41 commit df6a9e6

File tree

6 files changed

+39
-39
lines changed

6 files changed

+39
-39
lines changed

‎src/backend/tcop/postgres.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.11 1996/10/30 21:18:22 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.12 1996/10/31 10:20:56 scrappy Exp $
1111
*
1212
* NOTES
1313
* this is the "main" module of the postgres backend and
@@ -16,11 +16,11 @@
1616
*-------------------------------------------------------------------------
1717
*/
1818
#include "libpq/pqsignal.h" /* substitute for <signal.h> */
19-
#if defined(PORTNAME_linux)
19+
#if defined(linux)
2020
#ifndef __USE_POSIX
2121
#define __USE_POSIX
2222
#endif
23-
#endif /* defined(PORTNAME_linux) */
23+
#endif /* defined(linux) */
2424
#include <setjmp.h>
2525
#include <stdio.h>
2626
#include <string.h>
@@ -31,9 +31,9 @@
3131
#include <netdb.h> /* for MAXHOSTNAMELEN on some */
3232
#endif
3333
#include <errno.h>
34-
#ifdef PORTNAME_aix
34+
#ifdef aix
3535
#include <sys/select.h>
36-
#endif /* PORTNAME_aix */
36+
#endif /* aix */
3737

3838

3939
#include "postgres.h"
@@ -104,13 +104,13 @@ static bool IsEmptyQuery = false;
104104
Relation reldesc; /* current relation descritor */
105105
char relname[80]; /* current relation name */
106106

107-
#if defined(WIN32) || defined(PORTNAME_next)
107+
#if defined(WIN32) || defined(next)
108108
jmp_buf Warn_restart;
109109
#define sigsetjmp(x,y) setjmp(x)
110110
#define siglongjmp longjmp
111111
#else
112112
sigjmp_buf Warn_restart;
113-
#endif /*defined(WIN32) || defined(PORTNAME_next) */
113+
#endif /*defined(WIN32) || defined(next) */
114114
int InWarn;
115115

116116
extern int NBuffers;
@@ -1265,7 +1265,7 @@ PostgresMain(int argc, char *argv[])
12651265
*/
12661266
if (IsUnderPostmaster == false) {
12671267
puts("\nPOSTGRES backend interactive interface");
1268-
puts("$Revision: 1.11 $ $Date: 1996/10/30 21:18:22 $");
1268+
puts("$Revision: 1.12 $ $Date: 1996/10/31 10:20:56 $");
12691269
}
12701270

12711271
/* ----------------

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

Lines changed: 11 additions & 11 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.5 1996/10/26 05:03:24 bryanh Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.6 1996/10/31 10:23:17 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1229,7 +1229,7 @@ double x;
12291229

12301230
#ifdef NEED_ISINF
12311231

1232-
#if defined(PORTNAME_aix)
1232+
#if defined(aix)
12331233
#ifdef CLASS_CONFLICT
12341234
/* we want the math symbol */
12351235
#undef class
@@ -1245,9 +1245,9 @@ static int isinf(x)
12451245
return(-1);
12461246
return(0);
12471247
}
1248-
#endif /* PORTNAME_aix */
1248+
#endif /* aix */
12491249

1250-
#if defined(PORTNAME_ultrix4)
1250+
#if defined(ultrix4)
12511251
#include <fp_class.h>
12521252
static int isinf(x)
12531253
double x;
@@ -1259,9 +1259,9 @@ static int isinf(x)
12591259
return(-1);
12601260
return(0);
12611261
}
1262-
#endif /* PORTNAME_ultrix4 */
1262+
#endif /* ultrix4 */
12631263

1264-
#if defined(PORTNAME_alpha)
1264+
#if defined(alpha)
12651265
#include <fp_class.h>
12661266
static int isinf(x)
12671267
double x;
@@ -1273,9 +1273,9 @@ static int isinf(x)
12731273
return(-1);
12741274
return(0);
12751275
}
1276-
#endif /* PORTNAME_alpha */
1276+
#endif /* alpha */
12771277

1278-
#if defined(sparc_solaris) || defined(i386_solaris) || defined(PORTNAME_svr4)
1278+
#if defined(sparc_solaris) || defined(i386_solaris) || defined(svr4)
12791279
#include <ieeefp.h>
12801280
static int
12811281
isinf(d)
@@ -1294,9 +1294,9 @@ double d;
12941294

12951295
return (0);
12961296
}
1297-
#endif /* PORTNAME_sparc_solaris */
1297+
#endif /* sparc_solaris */
12981298

1299-
#if defined(PORTNAME_irix5)
1299+
#if defined(irix5)
13001300
#include <ieeefp.h>
13011301
static int
13021302
isinf(d)
@@ -1315,6 +1315,6 @@ double d;
13151315

13161316
return (0);
13171317
}
1318-
#endif /* PORTNAME_irix5 */
1318+
#endif /* irix5 */
13191319

13201320
#endif /* NEED_ISINF */

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

Lines changed: 7 additions & 7 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/misc.c,v 1.3 1996/07/22 21:56:02 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.4 1996/10/31 10:23:18 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -17,12 +17,12 @@
1717
#include "catalog/pg_type.h"
1818
#include "utils/builtins.h"
1919

20-
#if !defined(PORTNAME_aix) && \
21-
!defined(PORTNAME_BSD44_derived) && \
22-
!defined(PORTNAME_bsdi) && \
23-
!defined(PORTNAME_bsdi_2_1) && \
24-
!defined(PORTNAME_irix5) && \
25-
!defined(PORTNAME_linux)
20+
#if !defined(aix) && \
21+
!defined(BSD44_derived) && \
22+
!defined(bsdi) && \
23+
!defined(bsdi_2_1) && \
24+
!defined(irix5) && \
25+
!defined(linux)
2626
extern int random();
2727
extern int srandom(unsigned);
2828
#endif

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.3 1996/07/22 21:56:03 scrappy Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.4 1996/10/31 10:23:19 scrappy Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -132,9 +132,9 @@ ltoa(int32 l, char *a)
132132
int
133133
ftoa(double value, char *ascii, int width, int prec1, char format)
134134
{
135-
#if defined(PORTNAME_BSD44_derived) || \
136-
defined(PORTNAME_bsdi) || \
137-
defined(PORTNAME_bsdi_2_1)
135+
#if defined(BSD44_derived) || \
136+
defined(bsdi) || \
137+
defined(bsdi_2_1)
138138
char out[256];
139139
char fmt[256];
140140
int ret;
@@ -281,7 +281,7 @@ ftoa(double value, char *ascii, int width, int prec1, char format)
281281
*a = 0;
282282
avail = a - ascii;
283283
return (avail);
284-
#endif /* !PORTNAME_BSD44_derived */
284+
#endif /* !BSD44_derived */
285285
}
286286

287287
/*

‎src/backend/utils/error/elog.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.6 1996/10/13 18:39:41 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.7 1996/10/31 10:23:26 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -49,9 +49,9 @@ elog(int lev, const char *fmt, ... )
4949
register char *bp;
5050
register const char *cp;
5151
extern int errno, sys_nerr;
52-
#if !defined(PORTNAME_BSD44_derived) && \
53-
!defined(PORTNAME_bsdi) && \
54-
!defined(PORTNAME_bsdi_2_1)
52+
#if !defined(BSD44_derived) && \
53+
!defined(bsdi) && \
54+
!defined(bsdi_2_1)
5555
extern char *sys_errlist[];
5656
#endif /* bsd derived */
5757
#ifndef PG_STANDALONE

‎src/backend/utils/error/exc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.3 1996/07/22 21:58:28 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.4 1996/10/31 10:23:28 scrappy Exp $
1111
*
1212
* NOTE
1313
* XXX this code needs improvement--check for state violations and
@@ -90,9 +90,9 @@ ExcPrint(Exception *excP,
9090
{
9191
extern int errno;
9292
extern int sys_nerr;
93-
#if !defined(PORTNAME_BSD44_derived) && \
94-
!defined(PORTNAME_bsdi) && \
95-
!defined(PORTNAME_bsdi_2_1)
93+
#if !defined(BSD44_derived) && \
94+
!defined(bsdi) && \
95+
!defined(bsdi_2_1)
9696
extern char *sys_errlist[];
9797
#endif /* ! bsd_derived */
9898

0 commit comments

Comments
 (0)