2 files changed, 11 insertions, 7 deletions
diff --git a/src/include/config.h b/src/include/config.h
index 377f9ce63ed..ff90c1364f2 100644
--- a/src/include/config.h
+++ b/src/include/config.h
@@ -159,6 +159,14 @@
 /* OIDNAMELEN should be set to NAMEDATALEN + sizeof(Oid) */
 #define OIDNAMELEN  36
 
+/* 
+ * DEF_PGPORT is the TCP port number on which the Postmaster listens by
+ * default.  This can be overriden by command options, environment variables,
+ * and the postconfig hook.
+ */ 
+
+#define DEF_PGPORT "5432"
+
 /* turn this on if you prefer European style dates instead of American
  * style dates
  */
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index da88c6f824d..844340f9ef0 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -4,7 +4,6 @@
  *    this file contains general postgres administration and initialization
  *    stuff that used to be spread out between the following files:
  *	globals.h			global variables
- *	magic.h				PG_RELEASE, PG_VERSION, etc defines
  *	pdir.h				directory path crud
  *	pinit.h				postgres initialization
  *	pmod.h				processing modes
@@ -12,7 +11,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: miscadmin.h,v 1.3 1996/11/12 06:47:10 bryanh Exp $
+ * $Id: miscadmin.h,v 1.4 1996/11/14 10:25:42 bryanh Exp $
  *
  * NOTES
  *    some of the information in this file will be moved to
@@ -36,13 +35,12 @@ extern int PostmasterMain(int argc, char* argv[]);
  * from utils/init/globals.c
  */
 extern int Portfd;
-extern int Noversion;    /* moved from magic.c	*/
-extern int MasterPid;    /* declared and defined in utils/initglobals.c */
+extern int Noversion;    
+extern int MasterPid;    
 extern int Quiet;
 extern char *DataDir;   
 
 extern char	  OutputFileName[];
-extern void 	  InitGlobals(void);
 
 /*
  * done in storage/backendid.h for now.
@@ -83,8 +81,6 @@ extern char *GetPgUserName(void);
 extern void SetPgUserName(void);
 extern Oid GetUserId(void);
 extern void SetUserId(void);
-extern char *GetPGHome(void);
-extern char *GetPGData(void);
 extern int ValidateBackend(char *path);
 extern int FindBackend(char *backend, char *argv0);
 extern int CheckPathAccess(char *path, char *name, int open_mode);