More stuff to make it compile on various ports.

This commit is contained in:
Bryan Henderson 1996-11-27 08:16:44 +00:00
parent a38365e0eb
commit 9c0afeabb7
15 changed files with 116 additions and 75 deletions

View File

@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.74 1996/11/23 09:50:34 bryanh Exp $
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.75 1996/11/27 08:13:44 bryanh Exp $
#
# NOTES
# Essentially all Postgres make files include this file and use the
@ -606,7 +606,7 @@ ifeq ($(PORTNAME), sparc_solaris)
# cc won't work!
CC= gcc
LDADD_BE= -ll -ldl
LDADD_BE= -lsocket -lnsl -ll -ldl
# RANLIB is not used on solaris
RANLIB= touch

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.12 1996/11/16 08:09:16 bryanh Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.13 1996/11/27 08:15:16 bryanh Exp $
*
*-------------------------------------------------------------------------
*/
@ -27,6 +27,7 @@
#include <libpq/libpq.h>
#include <libpq/pqcomm.h>
#include <libpq/hba.h>
#include <port-protos.h> /* For inet_aton() */
#define CONF_FILE "pg_hba.conf"

View File

@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: port-protos.h,v 1.1.1.1 1996/07/09 06:21:45 scrappy Exp $
* $Id: port-protos.h,v 1.2 1996/11/27 08:15:23 bryanh Exp $
*
*-------------------------------------------------------------------------
*/
@ -14,6 +14,8 @@
#define PORT_PROTOS_H
#include <dlfcn.h>
#include "config.h" /* For MAXPATHLEN */
#include "fmgr.h" /* for func_ptr */
#include "utils/dynamic_loader.h"
@ -35,4 +37,11 @@
extern long random(void);
extern void srandom(int seed);
/* inet_aton.c in backend/port directory */
extern int inet_aton(const char *cp, struct in_addr *addr);
/* In system library, but can't find prototype in system library .h files */
extern int gethostname(char *name, int namelen);
#endif /* PORT_PROTOS_H */

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/port/sparc_solaris/Attic/port.c,v 1.2 1996/11/06 06:48:35 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/port/sparc_solaris/Attic/port.c,v 1.3 1996/11/27 08:15:25 bryanh Exp $
*
*-------------------------------------------------------------------------
*/
@ -15,6 +15,9 @@
#include <stdlib.h>
#include <errno.h>
#include "postgres.h"
#include "port-protos.h"
#include "rusagestub.h"
long

View File

@ -6,13 +6,20 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: port-protos.h,v 1.2 1996/11/26 03:18:58 bryanh Exp $
* $Id: port-protos.h,v 1.3 1996/11/27 08:15:30 bryanh Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef PORT_PORTOS_H
#define PORT_PORTOS_H
/*
* Externals in libc that need prototypes (or at least declarations)
*/
extern char *ecvt(double, int, int*, int*);
extern char *fcvt(double, int, int*, int*);
/* dynloader.c */
/*
* New dynamic loader.

View File

@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.26 1996/11/24 04:07:00 bryanh Exp $
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.27 1996/11/27 08:15:36 bryanh Exp $
*
* NOTES
*
@ -80,6 +80,7 @@
#include "utils/mcxt.h"
#include "storage/proc.h"
#include "utils/elog.h"
#include "port-protos.h" /* For gethostname() */
#if defined(DBX_VERSION)
# define FORK() (0)

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.7 1996/11/27 07:20:07 vadim Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.8 1996/11/27 08:15:44 bryanh Exp $
*
*-------------------------------------------------------------------------
*/
@ -59,7 +59,7 @@
*/
#include <stdio.h>
#include <string.h>
#include <sys/ipc.h>
#include "postgres.h"
#include "storage/ipc.h"
#include "storage/shmem.h"

View File

@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.6 1996/11/06 10:30:58 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.7 1996/11/27 08:15:54 bryanh Exp $
*
*-------------------------------------------------------------------------
*/
@ -24,6 +24,7 @@
#else
# include <string.h>
#endif
#include <port-protos.h> /* ecvt(), fcvt() */
int32
pg_atoi(char *s, int size, int c)

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.5 1996/11/10 03:03:26 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.6 1996/11/27 08:16:01 bryanh Exp $
*
*-------------------------------------------------------------------------
*/
@ -32,6 +32,7 @@
#include <stdio.h> /* for sprintf() */
#include <errno.h>
#include <sys/file.h>
#include <fcntl.h>
#include <string.h>
#include "postgres.h"

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.3 1996/11/24 04:44:14 bryanh Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.4 1996/11/27 08:16:07 bryanh Exp $
*
*-------------------------------------------------------------------------
*/
@ -18,6 +18,7 @@
#include "postgres.h"
#include "config.h" /* for MAXPATHLEN */
#include "fmgr.h" /* generated by Gen_fmgrtab.sh */
#include "utils/dynamic_loader.h"
#include "utils/elog.h"

View File

@ -26,7 +26,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.17 1996/11/26 08:12:39 bryanh Exp $
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.18 1996/11/27 08:16:16 bryanh Exp $
#
#-------------------------------------------------------------------------
@ -51,9 +51,11 @@ CMDNAME=`basename $0`
# The 2>/dev/null is to swallow the "postconfig: not found" message if there
# is no postconfig.
postconfig_result="$(sh -c postconfig 2>/dev/null)"
postconfig_result=`sh -c postconfig 2>/dev/null`
if [ ! -z $postconfig_result ]; then
export $postconfig_result
set -a # Make the following variable assignment exported to environment
eval $postconfig_result
set +a # back to normal
fi
# Set defaults:
@ -131,8 +133,8 @@ if [ -z $PGLIB ]; then
echo "Postgres (the PGLIB directory). You must identify the PGLIB "
echo "directory either with a --pglib invocation option, or by "
echo "setting the PGLIB environment variable, or by having a program "
echo "called 'postconfig' in your search path that sets the PGLIB "
echo "environment variable."
echo "called 'postconfig' in your search path that outputs an asignment "
echo "for PGLIB."
exit 20
fi

View File

@ -17,8 +17,14 @@
#define HAVE_MEMMOVE
#if defined(sequent)
#if defined(aix)
# define CLASS_CONFLICT
# define DISABLE_XOPEN_NLS
# define NEED_ISINF
# define NEED_UNION_SEMUN
# define NEED_SYS_SELECT_H
# define HAVE_TZSET
# define HAVE_ANSI_CPP
#endif
#if defined(alpha)
@ -30,6 +36,19 @@
# define NEED_UNION_SEMUN
#endif
#if defined(BSD44_derived) || \
defined(bsdi)
# if defined(bsdi)
# define SIGJMP_BUF
# endif
# define USE_LIMITS_H
# define USE_POSIX_TIME
# define NEED_CBRT
# if defined(PRE_BSDI_2_1)
# define NEED_UNION_SEMUN
# endif
#endif
#if defined(dgux)
# define LINUX_ELF
# define NEED_UNION_SEMUN
@ -37,26 +56,8 @@
# define -DUSE_POSIX_SIGNALS
#endif
#if defined(ultrix4)
# define NEED_ISINF
# define USE_POSIX_TIME
# define NEED_UNION_SEMUN
# define NEED_STRDUP
#endif
#if defined(linux)
/* __USE_POSIX, __USE_BSD, and __USE_BSD_SIGNAL used to be defined either
here or with -D compile options, but __ macros should be set and used by C
library macros, not Postgres code. __USE_POSIX is set by features.h,
__USE_BSD is set by bsd/signal.h, and __USE_BSD_SIGNAL appears not to
be used.
*/
# define USE_POSIX_TIME
# define HAVE_TZSET
# define NEED_CBRT
#endif
#if defined(hpux)
# define SIGJMP_BUF
# define USE_POSIX_TIME
# define HAVE_TZSET
# define NEED_CBRT
@ -75,6 +76,38 @@
# define SYSV_DIRENT
#endif
#if defined(irix5)
# define USE_POSIX_TIME
# define USE_POSIX_SIGNALS
# define NEED_ISINF
# define NO_EMPTY_STMTS
# define NO_VFORK
# define HAVE_TZSET
# define SYSV_DIRENT
#endif
#if defined(linux)
/* __USE_POSIX, __USE_BSD, and __USE_BSD_SIGNAL used to be defined either
here or with -D compile options, but __ macros should be set and used by C
library macros, not Postgres code. __USE_POSIX is set by features.h,
__USE_BSD is set by bsd/signal.h, and __USE_BSD_SIGNAL appears not to
be used.
*/
# define SIGJMP_BUF
# define USE_POSIX_TIME
# define HAVE_TZSET
# define NEED_CBRT
#endif
#if defined(next)
# define SIGJMP_BUF
# define NEED_SIG_JMP
#endif
#if defined(sequent)
# define NEED_UNION_SEMUN
#endif
#if defined(sparc) && !defined(sparc_solaris)
# define USE_POSIX_TIME
# undef HAVE_MEMMOVE
@ -103,11 +136,8 @@
# define SYSV_DIRENT
#endif
#if defined(next)
# define NEED_SIG_JMP
#endif
#if defined(win32)
# define SIGJMP_BUF
# define NEED_SIG_JMP
# define NO_UNISTD_H
# define USES_WINSOCK
@ -118,36 +148,14 @@
# define NEED_ISINF
#endif /* WIN32 */
#if defined(BSD44_derived) || \
defined(bsdi)
# define USE_LIMITS_H
# define USE_POSIX_TIME
# define NEED_CBRT
# ifdef PRE_BSDI_2_1
# define NEED_UNION_SEMUN
# endif
#endif
#if defined(aix)
# define CLASS_CONFLICT
# define DISABLE_XOPEN_NLS
# define NEED_ISINF
# define NEED_UNION_SEMUN
# define NEED_SYS_SELECT_H
# define HAVE_TZSET
# define HAVE_ANSI_CPP
#endif
#if defined(irix5)
# define USE_POSIX_TIME
# define USE_POSIX_SIGNALS
#if defined(ultrix4)
# define NEED_ISINF
# define NO_EMPTY_STMTS
# define NO_VFORK
# define HAVE_TZSET
# define SYSV_DIRENT
# define USE_POSIX_TIME
# define NEED_UNION_SEMUN
# define NEED_STRDUP
#endif
/*
* The following is used as the arg list for signal handlers. Any ports
* that take something other than an int argument should change this in

View File

@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: ipc.h,v 1.9 1996/11/04 04:00:28 momjian Exp $
* $Id: ipc.h,v 1.10 1996/11/27 08:16:38 bryanh Exp $
*
* NOTES
* This file is very architecture-specific. This stuff should actually
@ -22,6 +22,7 @@
#endif
#include <sys/types.h>
#include <sys/ipc.h> /* For IPC_PRIVATE */
/*
* Many architectures have support for user-level spinlocks (i.e., an

8
src/include/strdup.h Normal file
View File

@ -0,0 +1,8 @@
/* This is the prototype for the strdup() function which is distributed
with Postgres. That strdup() is only needed on those systems that
don't already have strdup() in their system libraries.
The Postgres strdup() is in src/utils/strdup.c.
*/
extern char* strdup(char const*);

View File

@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: exc.h,v 1.4 1996/11/10 03:06:26 momjian Exp $
* $Id: exc.h,v 1.5 1996/11/27 08:16:44 bryanh Exp $
*
*-------------------------------------------------------------------------
*/
@ -15,17 +15,15 @@
#include <setjmp.h>
#include "config.h"
extern char *ExcFileName;
extern Index ExcLineNumber;
/*
* ExcMessage and Exception are now defined in c.h
*/
#if defined(hpux) || \
defined(linux) || \
defined(next) || \
defined(WIN32)
#if !defined(SIGJMP_BUF)
typedef jmp_buf ExcContext;
#else
typedef sigjmp_buf ExcContext;