Skip to content

P
Postgres FD Implementation
Commit df6a9e63 authored by Marc G. Fournier's avatar Marc G. Fournier
Browse files
Options

more removal of PORTNAME_*

parent 4df1a414
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 39 deletions
src/backend/tcop/postgres.c
View file @ df6a9e63
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.11 1996/10/30 21:18:22 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.12 1996/10/31 10:20:56 scrappy Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include "libpq/pqsignal.h" /* substitute for <signal.h> */ #include "libpq/pqsignal.h" /* substitute for <signal.h> */
#if defined(PORTNAME_linux) #if defined(linux)
#ifndef __USE_POSIX #ifndef __USE_POSIX
#define __USE_POSIX #define __USE_POSIX
#endif #endif
#endif /* defined(PORTNAME_linux) */ #endif /* defined(linux) */
#include <setjmp.h> #include <setjmp.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
...@@ -31,9 +31,9 @@ ...@@ -31,9 +31,9 @@
#include <netdb.h> /* for MAXHOSTNAMELEN on some */ #include <netdb.h> /* for MAXHOSTNAMELEN on some */
#endif #endif
#include <errno.h> #include <errno.h>
#ifdef PORTNAME_aix #ifdef aix
#include <sys/select.h> #include <sys/select.h>
#endif /* PORTNAME_aix */ #endif /* aix */
#include "postgres.h" #include "postgres.h"
...@@ -104,13 +104,13 @@ static bool IsEmptyQuery = false; ...@@ -104,13 +104,13 @@ static bool IsEmptyQuery = false;
Relation reldesc; /* current relation descritor */ Relation reldesc; /* current relation descritor */
char relname[80]; /* current relation name */ char relname[80]; /* current relation name */
#if defined(WIN32) || defined(PORTNAME_next) #if defined(WIN32) || defined(next)
jmp_buf Warn_restart; jmp_buf Warn_restart;
#define sigsetjmp(x,y) setjmp(x) #define sigsetjmp(x,y) setjmp(x)
#define siglongjmp longjmp #define siglongjmp longjmp
#else #else
sigjmp_buf Warn_restart; sigjmp_buf Warn_restart;
#endif /*defined(WIN32) || defined(PORTNAME_next) */ #endif /*defined(WIN32) || defined(next) */
int InWarn; int InWarn;
extern int NBuffers; extern int NBuffers;
...@@ -1265,7 +1265,7 @@ PostgresMain(int argc, char *argv[]) ...@@ -1265,7 +1265,7 @@ PostgresMain(int argc, char *argv[])
*/ */
if (IsUnderPostmaster == false) { if (IsUnderPostmaster == false) {
puts("\nPOSTGRES backend interactive interface"); puts("\nPOSTGRES backend interactive interface");
puts("$Revision: 1.11 $ $Date: 1996/10/30 21:18:22 $"); puts("$Revision: 1.12 $ $Date: 1996/10/31 10:20:56 $");
} }
/* ---------------- /* ----------------
......
src/backend/utils/adt/float.c
View file @ df6a9e63
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.5 1996/10/26 05:03:24 bryanh Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.6 1996/10/31 10:23:17 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1229,7 +1229,7 @@ double x; ...@@ -1229,7 +1229,7 @@ double x;
#ifdef NEED_ISINF #ifdef NEED_ISINF
#if defined(PORTNAME_aix) #if defined(aix)
#ifdef CLASS_CONFLICT #ifdef CLASS_CONFLICT
/* we want the math symbol */ /* we want the math symbol */
#undef class #undef class
...@@ -1245,9 +1245,9 @@ static int isinf(x) ...@@ -1245,9 +1245,9 @@ static int isinf(x)
return(-1); return(-1);
return(0); return(0);
} }
#endif /* PORTNAME_aix */ #endif /* aix */
#if defined(PORTNAME_ultrix4) #if defined(ultrix4)
#include <fp_class.h> #include <fp_class.h>
static int isinf(x) static int isinf(x)
double x; double x;
...@@ -1259,9 +1259,9 @@ static int isinf(x) ...@@ -1259,9 +1259,9 @@ static int isinf(x)
return(-1); return(-1);
return(0); return(0);
} }
#endif /* PORTNAME_ultrix4 */ #endif /* ultrix4 */
#if defined(PORTNAME_alpha) #if defined(alpha)
#include <fp_class.h> #include <fp_class.h>
static int isinf(x) static int isinf(x)
double x; double x;
...@@ -1273,9 +1273,9 @@ static int isinf(x) ...@@ -1273,9 +1273,9 @@ static int isinf(x)
return(-1); return(-1);
return(0); return(0);
} }
#endif /* PORTNAME_alpha */ #endif /* alpha */
#if defined(sparc_solaris) || defined(i386_solaris) || defined(PORTNAME_svr4) #if defined(sparc_solaris) || defined(i386_solaris) || defined(svr4)
#include <ieeefp.h> #include <ieeefp.h>
static int static int
isinf(d) isinf(d)
...@@ -1294,9 +1294,9 @@ double d; ...@@ -1294,9 +1294,9 @@ double d;
return (0); return (0);
} }
#endif /* PORTNAME_sparc_solaris */ #endif /* sparc_solaris */
#if defined(PORTNAME_irix5) #if defined(irix5)
#include <ieeefp.h> #include <ieeefp.h>
static int static int
isinf(d) isinf(d)
...@@ -1315,6 +1315,6 @@ double d; ...@@ -1315,6 +1315,6 @@ double d;
return (0); return (0);
} }
#endif /* PORTNAME_irix5 */ #endif /* irix5 */
#endif /* NEED_ISINF */ #endif /* NEED_ISINF */
src/backend/utils/adt/misc.c
View file @ df6a9e63
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.3 1996/07/22 21:56:02 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.4 1996/10/31 10:23:18 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
#include "catalog/pg_type.h" #include "catalog/pg_type.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#if !defined(PORTNAME_aix) && \ #if !defined(aix) && \
!defined(PORTNAME_BSD44_derived) && \ !defined(BSD44_derived) && \
!defined(PORTNAME_bsdi) && \ !defined(bsdi) && \
!defined(PORTNAME_bsdi_2_1) && \ !defined(bsdi_2_1) && \
!defined(PORTNAME_irix5) && \ !defined(irix5) && \
!defined(PORTNAME_linux) !defined(linux)
extern int random(); extern int random();
extern int srandom(unsigned); extern int srandom(unsigned);
#endif #endif
......
src/backend/utils/adt/numutils.c
View file @ df6a9e63
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.3 1996/07/22 21:56:03 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.4 1996/10/31 10:23:19 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -132,9 +132,9 @@ ltoa(int32 l, char *a) ...@@ -132,9 +132,9 @@ ltoa(int32 l, char *a)
int int
ftoa(double value, char *ascii, int width, int prec1, char format) ftoa(double value, char *ascii, int width, int prec1, char format)
{ {
#if defined(PORTNAME_BSD44_derived) || \ #if defined(BSD44_derived) || \
defined(PORTNAME_bsdi) || \ defined(bsdi) || \
defined(PORTNAME_bsdi_2_1) defined(bsdi_2_1)
char out[256]; char out[256];
char fmt[256]; char fmt[256];
int ret; int ret;
...@@ -281,7 +281,7 @@ ftoa(double value, char *ascii, int width, int prec1, char format) ...@@ -281,7 +281,7 @@ ftoa(double value, char *ascii, int width, int prec1, char format)
*a = 0; *a = 0;
avail = a - ascii; avail = a - ascii;
return (avail); return (avail);
#endif /* !PORTNAME_BSD44_derived */ #endif /* !BSD44_derived */
} }
/* /*
......
src/backend/utils/error/elog.c
View file @ df6a9e63
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.6 1996/10/13 18:39:41 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.7 1996/10/31 10:23:26 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -49,9 +49,9 @@ elog(int lev, const char *fmt, ... ) ...@@ -49,9 +49,9 @@ elog(int lev, const char *fmt, ... )
register char *bp; register char *bp;
register const char *cp; register const char *cp;
extern int errno, sys_nerr; extern int errno, sys_nerr;
#if !defined(PORTNAME_BSD44_derived) && \ #if !defined(BSD44_derived) && \
!defined(PORTNAME_bsdi) && \ !defined(bsdi) && \
!defined(PORTNAME_bsdi_2_1) !defined(bsdi_2_1)
extern char *sys_errlist[]; extern char *sys_errlist[];
#endif /* bsd derived */ #endif /* bsd derived */
#ifndef PG_STANDALONE #ifndef PG_STANDALONE
......
src/backend/utils/error/exc.c
View file @ df6a9e63
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.3 1996/07/22 21:58:28 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.4 1996/10/31 10:23:28 scrappy Exp $
* *
* NOTE * NOTE
* XXX this code needs improvement--check for state violations and * XXX this code needs improvement--check for state violations and
...@@ -90,9 +90,9 @@ ExcPrint(Exception *excP, ...@@ -90,9 +90,9 @@ ExcPrint(Exception *excP,
{ {
extern int errno; extern int errno;
extern int sys_nerr; extern int sys_nerr;
#if !defined(PORTNAME_BSD44_derived) && \ #if !defined(BSD44_derived) && \
!defined(PORTNAME_bsdi) && \ !defined(bsdi) && \
!defined(PORTNAME_bsdi_2_1) !defined(bsdi_2_1)
extern char *sys_errlist[]; extern char *sys_errlist[];
#endif /* ! bsd_derived */ #endif /* ! bsd_derived */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment