From 8ed5918faa21f26fe7c0c36487960e815ef6b108 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 19 Jun 1998 02:55:19 +0000 Subject: Solaris cleanup. --- src/backend/port/dynloader/i386_solaris.c | 4 --- src/backend/port/dynloader/i386_solaris.h | 34 ------------------------ src/backend/port/dynloader/solaris_i386.c | 4 +++ src/backend/port/dynloader/solaris_i386.h | 34 ++++++++++++++++++++++++ src/backend/port/dynloader/solaris_sparc.c | 4 +++ src/backend/port/dynloader/solaris_sparc.h | 38 +++++++++++++++++++++++++++ src/backend/port/dynloader/sparc_solaris.c | 4 --- src/backend/port/dynloader/sparc_solaris.h | 38 --------------------------- src/backend/port/getrusage.c | 6 ++--- src/backend/port/tas/solaris_i386.s | 2 +- src/backend/storage/ipc/ipc.c | 4 +-- src/backend/storage/lmgr/proc.c | 6 ++--- src/bin/pg_dump/common.c | 4 +-- src/bin/pg_dump/pg_dump.c | 4 +-- src/include/port/i386_solaris.h | 42 ------------------------------ src/include/port/solaris_i386.h | 42 ++++++++++++++++++++++++++++++ src/include/port/solaris_sparc.h | 19 ++++++++++++++ src/include/port/sparc_solaris.h | 19 -------------- 18 files changed, 154 insertions(+), 154 deletions(-) delete mode 100644 src/backend/port/dynloader/i386_solaris.c delete mode 100644 src/backend/port/dynloader/i386_solaris.h create mode 100755 src/backend/port/dynloader/solaris_i386.c create mode 100755 src/backend/port/dynloader/solaris_i386.h create mode 100755 src/backend/port/dynloader/solaris_sparc.c create mode 100755 src/backend/port/dynloader/solaris_sparc.h delete mode 100644 src/backend/port/dynloader/sparc_solaris.c delete mode 100644 src/backend/port/dynloader/sparc_solaris.h delete mode 100644 src/include/port/i386_solaris.h create mode 100755 src/include/port/solaris_i386.h create mode 100755 src/include/port/solaris_sparc.h delete mode 100644 src/include/port/sparc_solaris.h (limited to 'src') diff --git a/src/backend/port/dynloader/i386_solaris.c b/src/backend/port/dynloader/i386_solaris.c deleted file mode 100644 index 0d566f3a612..00000000000 --- a/src/backend/port/dynloader/i386_solaris.c +++ /dev/null @@ -1,4 +0,0 @@ -/* Dummy file used for nothing at this point - * - * see i386_solaris.h - */ diff --git a/src/backend/port/dynloader/i386_solaris.h b/src/backend/port/dynloader/i386_solaris.h deleted file mode 100644 index adbd4a4c3be..00000000000 --- a/src/backend/port/dynloader/i386_solaris.h +++ /dev/null @@ -1,34 +0,0 @@ -/*------------------------------------------------------------------------- - * - * port-protos.h-- - * port-specific prototypes for SunOS 4 - * - * - * Copyright (c) 1994, Regents of the University of California - * - * $Id: i386_solaris.h,v 1.1 1997/12/20 03:23:33 scrappy Exp $ - * - *------------------------------------------------------------------------- - */ -#ifndef PORT_PROTOS_H -#define PORT_PROTOS_H - -#include -#include "fmgr.h" /* for func_ptr */ -#include "utils/dynamic_loader.h" - -/* dynloader.c */ -/* - * Dynamic Loader on SunOS 4. - * - * this dynamic loader uses the system dynamic loading interface for shared - * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared - * library as the file to be dynamically loaded. - * - */ -#define pg_dlopen(f) dlopen(f,1) -#define pg_dlsym dlsym -#define pg_dlclose dlclose -#define pg_dlerror dlerror - -#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/solaris_i386.c b/src/backend/port/dynloader/solaris_i386.c new file mode 100755 index 00000000000..4adf3093c1c --- /dev/null +++ b/src/backend/port/dynloader/solaris_i386.c @@ -0,0 +1,4 @@ +/* Dummy file used for nothing at this point + * + * see solaris_i386.h + */ diff --git a/src/backend/port/dynloader/solaris_i386.h b/src/backend/port/dynloader/solaris_i386.h new file mode 100755 index 00000000000..631fa0648e9 --- /dev/null +++ b/src/backend/port/dynloader/solaris_i386.h @@ -0,0 +1,34 @@ +/*------------------------------------------------------------------------- + * + * port-protos.h-- + * port-specific prototypes for SunOS 4 + * + * + * Copyright (c) 1994, Regents of the University of California + * + * $Id: solaris_i386.h,v 1.1 1998/06/19 02:55:06 momjian Exp $ + * + *------------------------------------------------------------------------- + */ +#ifndef PORT_PROTOS_H +#define PORT_PROTOS_H + +#include +#include "fmgr.h" /* for func_ptr */ +#include "utils/dynamic_loader.h" + +/* dynloader.c */ +/* + * Dynamic Loader on SunOS 4. + * + * this dynamic loader uses the system dynamic loading interface for shared + * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared + * library as the file to be dynamically loaded. + * + */ +#define pg_dlopen(f) dlopen(f,1) +#define pg_dlsym dlsym +#define pg_dlclose dlclose +#define pg_dlerror dlerror + +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/solaris_sparc.c b/src/backend/port/dynloader/solaris_sparc.c new file mode 100755 index 00000000000..4adf3093c1c --- /dev/null +++ b/src/backend/port/dynloader/solaris_sparc.c @@ -0,0 +1,4 @@ +/* Dummy file used for nothing at this point + * + * see solaris_i386.h + */ diff --git a/src/backend/port/dynloader/solaris_sparc.h b/src/backend/port/dynloader/solaris_sparc.h new file mode 100755 index 00000000000..22c7d67c774 --- /dev/null +++ b/src/backend/port/dynloader/solaris_sparc.h @@ -0,0 +1,38 @@ +/*------------------------------------------------------------------------- + * + * port-protos.h-- + * port-specific prototypes for SunOS 4 + * + * + * Copyright (c) 1994, Regents of the University of California + * + * $Id: solaris_sparc.h,v 1.1 1998/06/19 02:55:06 momjian Exp $ + * + *------------------------------------------------------------------------- + */ +#ifndef PORT_PROTOS_H +#define PORT_PROTOS_H + +#include /* For struct in_addr */ +#include + +#include + +#include "fmgr.h" /* for func_ptr */ +#include "utils/dynamic_loader.h" + +/* dynloader.c */ +/* + * Dynamic Loader on SunOS 4. + * + * this dynamic loader uses the system dynamic loading interface for shared + * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared + * library as the file to be dynamically loaded. + * + */ +#define pg_dlopen(f) dlopen(f,1) +#define pg_dlsym dlsym +#define pg_dlclose dlclose +#define pg_dlerror dlerror + +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/dynloader/sparc_solaris.c b/src/backend/port/dynloader/sparc_solaris.c deleted file mode 100644 index 0d566f3a612..00000000000 --- a/src/backend/port/dynloader/sparc_solaris.c +++ /dev/null @@ -1,4 +0,0 @@ -/* Dummy file used for nothing at this point - * - * see i386_solaris.h - */ diff --git a/src/backend/port/dynloader/sparc_solaris.h b/src/backend/port/dynloader/sparc_solaris.h deleted file mode 100644 index 3645c939aeb..00000000000 --- a/src/backend/port/dynloader/sparc_solaris.h +++ /dev/null @@ -1,38 +0,0 @@ -/*------------------------------------------------------------------------- - * - * port-protos.h-- - * port-specific prototypes for SunOS 4 - * - * - * Copyright (c) 1994, Regents of the University of California - * - * $Id: sparc_solaris.h,v 1.1 1997/12/20 03:35:55 scrappy Exp $ - * - *------------------------------------------------------------------------- - */ -#ifndef PORT_PROTOS_H -#define PORT_PROTOS_H - -#include /* For struct in_addr */ -#include - -#include - -#include "fmgr.h" /* for func_ptr */ -#include "utils/dynamic_loader.h" - -/* dynloader.c */ -/* - * Dynamic Loader on SunOS 4. - * - * this dynamic loader uses the system dynamic loading interface for shared - * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared - * library as the file to be dynamically loaded. - * - */ -#define pg_dlopen(f) dlopen(f,1) -#define pg_dlsym dlsym -#define pg_dlclose dlclose -#define pg_dlerror dlerror - -#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/getrusage.c b/src/backend/port/getrusage.c index fb2a1fe7a3d..f1fa5d0bd7e 100644 --- a/src/backend/port/getrusage.c +++ b/src/backend/port/getrusage.c @@ -1,4 +1,4 @@ -/* $Id: getrusage.c,v 1.7 1998/02/26 04:34:00 momjian Exp $ */ +/* $Id: getrusage.c,v 1.8 1998/06/19 02:55:04 momjian Exp $ */ #include /* for pow() prototype */ @@ -7,9 +7,9 @@ #if 0 /* this is from univel port ... how does * compiler define? */ - /* same for i386_solaris port ... how does compiler define? */ + /* same for solaris_i386 port ... how does compiler define? */ /* same for sco port ... how does compiler define? */ - /* same for sparc_solaris port ... how does compiler define? */ + /* same for solaris_sparc port ... how does compiler define? */ /* same for svr4 port ... how does compiler define? */ int getrusage(int who, struct rusage * rusage) diff --git a/src/backend/port/tas/solaris_i386.s b/src/backend/port/tas/solaris_i386.s index db8116dd8ff..c63aebef326 100644 --- a/src/backend/port/tas/solaris_i386.s +++ b/src/backend/port/tas/solaris_i386.s @@ -1,5 +1,5 @@ /============================================================================= -/ tas.s -- test and set lock for i386_solaris +/ tas.s -- test and set lock for solaris_i386 /============================================================================= .file "tas.s" diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c index d3e907b2c78..d9d5a503d0f 100644 --- a/src/backend/storage/ipc/ipc.c +++ b/src/backend/storage/ipc/ipc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.24 1998/06/18 03:56:08 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.25 1998/06/19 02:55:10 momjian Exp $ * * NOTES * @@ -40,7 +40,7 @@ #include "utils/memutils.h" #include "libpq/libpq.h" -#if defined(sparc_solaris) +#if defined(solaris_sparc) #include #include #endif diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 31d43723805..d6ef6f9e7af 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.35 1998/06/15 19:29:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.36 1998/06/19 02:55:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,7 +46,7 @@ * This is so that we can support more backends. (system-wide semaphore * sets run out pretty fast.) -ay 4/95 * - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.35 1998/06/15 19:29:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.36 1998/06/19 02:55:11 momjian Exp $ */ #include #include @@ -54,7 +54,7 @@ #include #include -#if defined(sparc_solaris) +#if defined(solaris_sparc) #include #include #endif diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c index bc58b8e45c2..d84ac0aa5ec 100644 --- a/src/bin/pg_dump/common.c +++ b/src/bin/pg_dump/common.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.21 1998/06/15 19:30:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.22 1998/06/19 02:55:13 momjian Exp $ * * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2 * @@ -24,7 +24,7 @@ #include #include #include /* for MAXHOSTNAMELEN on most */ -#ifdef sparc_solaris +#ifdef solaris_sparc #include /* for MAXHOSTNAMELEN on some */ #endif diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index d80a2676dc1..72438963124 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -21,7 +21,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.74 1998/06/16 07:29:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.75 1998/06/19 02:55:14 momjian Exp $ * * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb * @@ -57,7 +57,7 @@ #include #include #include /* for MAXHOSTNAMELEN on most */ -#ifdef sparc_solaris +#ifdef solaris_sparc #include /* for MAXHOSTNAMELEN on some */ #endif diff --git a/src/include/port/i386_solaris.h b/src/include/port/i386_solaris.h deleted file mode 100644 index b2df1ba5e2c..00000000000 --- a/src/include/port/i386_solaris.h +++ /dev/null @@ -1,42 +0,0 @@ -#define USE_POSIX_TIME -#define USE_POSIX_SIGNALS -#define NO_EMPTY_STMTS -#define SYSV_DIRENT -#define HAS_TEST_AND_SET -typedef unsigned char slock_t; - -#include - -#ifndef BIG_ENDIAN -#define BIG_ENDIAN 4321 -#endif -#ifndef LITTLE_ENDIAN -#define LITTLE_ENDIAN 1234 -#endif -#ifndef PDP_ENDIAN -#define PDP_ENDIAN 3412 -#endif -#ifndef BYTE_ORDER -#define BYTE_ORDER LITTLE_ENDIAN -#endif - -#ifndef NAN - -#ifndef __nan_bytes -#define __nan_bytes { 0, 0, 0, 0, 0, 0, 0xf8, 0x7f } -#endif /* __nan_bytes */ - -#ifdef __GNUC__ -#define NAN \ - (__extension__ ((union { unsigned char __c[8]; \ - double __d; }) \ - { __nan_bytes }).__d) - -#else /* Not GCC. */ -#define NAN (*(__const double *) __nan) -#endif /* GCC. */ -#endif /* NAN */ - -#ifndef index -#define index strchr -#endif diff --git a/src/include/port/solaris_i386.h b/src/include/port/solaris_i386.h new file mode 100755 index 00000000000..b2df1ba5e2c --- /dev/null +++ b/src/include/port/solaris_i386.h @@ -0,0 +1,42 @@ +#define USE_POSIX_TIME +#define USE_POSIX_SIGNALS +#define NO_EMPTY_STMTS +#define SYSV_DIRENT +#define HAS_TEST_AND_SET +typedef unsigned char slock_t; + +#include + +#ifndef BIG_ENDIAN +#define BIG_ENDIAN 4321 +#endif +#ifndef LITTLE_ENDIAN +#define LITTLE_ENDIAN 1234 +#endif +#ifndef PDP_ENDIAN +#define PDP_ENDIAN 3412 +#endif +#ifndef BYTE_ORDER +#define BYTE_ORDER LITTLE_ENDIAN +#endif + +#ifndef NAN + +#ifndef __nan_bytes +#define __nan_bytes { 0, 0, 0, 0, 0, 0, 0xf8, 0x7f } +#endif /* __nan_bytes */ + +#ifdef __GNUC__ +#define NAN \ + (__extension__ ((union { unsigned char __c[8]; \ + double __d; }) \ + { __nan_bytes }).__d) + +#else /* Not GCC. */ +#define NAN (*(__const double *) __nan) +#endif /* GCC. */ +#endif /* NAN */ + +#ifndef index +#define index strchr +#endif diff --git a/src/include/port/solaris_sparc.h b/src/include/port/solaris_sparc.h new file mode 100755 index 00000000000..8383215b708 --- /dev/null +++ b/src/include/port/solaris_sparc.h @@ -0,0 +1,19 @@ +#define USE_POSIX_TIME +#define USE_POSIX_SIGNALS +#define NO_EMPTY_STMTS +#define SYSV_DIRENT +#define HAS_TEST_AND_SET +typedef unsigned char slock_t; + +#ifndef BIG_ENDIAN +#define BIG_ENDIAN 4321 +#endif +#ifndef LITTLE_ENDIAN +#define LITTLE_ENDIAN 1234 +#endif +#ifndef PDP_ENDIAN +#define PDP_ENDIAN 3412 +#endif +#ifndef BYTE_ORDER +#define BYTE_ORDER BIG_ENDIAN +#endif diff --git a/src/include/port/sparc_solaris.h b/src/include/port/sparc_solaris.h deleted file mode 100644 index 8383215b708..00000000000 --- a/src/include/port/sparc_solaris.h +++ /dev/null @@ -1,19 +0,0 @@ -#define USE_POSIX_TIME -#define USE_POSIX_SIGNALS -#define NO_EMPTY_STMTS -#define SYSV_DIRENT -#define HAS_TEST_AND_SET -typedef unsigned char slock_t; - -#ifndef BIG_ENDIAN -#define BIG_ENDIAN 4321 -#endif -#ifndef LITTLE_ENDIAN -#define LITTLE_ENDIAN 1234 -#endif -#ifndef PDP_ENDIAN -#define PDP_ENDIAN 3412 -#endif -#ifndef BYTE_ORDER -#define BYTE_ORDER BIG_ENDIAN -#endif -- cgit v1.2.3