Turns out OIDNAMELEN wasn't really being used at all!

Get rid of it to make customization of NAMEDATALEN easier.

diff --git a/src/backend/catalog/genbki.sh.in b/src/backend/catalog/genbki.sh.in
index 52655243cf624376b9aa2aad538e3f2937fe8588..d7b925f27ea5723092269546ab71c9cbb7cc185b 100644 (file)
--- a/src/backend/catalog/genbki.sh.in
+++ b/src/backend/catalog/genbki.sh.in
@@ -10,7 +10,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh.in,v 1.2 1998/10/28 19:38:46 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh.in,v 1.3 1999/06/04 21:12:06 tgl Exp $
 #
 # NOTES
 #    non-essential whitespace is removed from the generated file.
@@ -52,9 +52,8 @@ while test $x -le $numargs ; do
     shift
 done
 
-# Get NAMEDATALEN and OIDNAMELEN from postgres_ext.h
+# Get NAMEDATALEN from postgres_ext.h
 NAMEDATALEN=`grep '#define.*NAMEDATALEN' ../../include/postgres_ext.h | awk '{ print $3 }'`
-OIDNAMELEN=`grep '#define.*OIDNAMELEN' ../../include/postgres_ext.h | awk '{ print $3 }'`
 
 # ----------------
 #      strip comments and trash from .h before we generate
@@ -80,9 +79,8 @@ sed -e "s/;[  ]*$//g" \
     -e "s/^NameData/\name/g" \
     -e "s/(NameData/(name/g" \
     -e "s/(Oid/(oid/g" \
-       -e "s/NAMEDATALEN/$NAMEDATALEN/g" \
-       -e "s/OIDNAMELEN/$OIDNAMELEN/g" | \
-awk '
+    -e "s/NAMEDATALEN/$NAMEDATALEN/g" \
+| awk '
 # ----------------
 #      now use awk to process remaining .h file..
 #

diff --git a/src/bin/initlocation/Makefile b/src/bin/initlocation/Makefile
index 43f12a42af61e3263d55f9797c061cc13906bff1..de55678d7d695042e4b42e4060a50dae8c376ce9 100644 (file)
--- a/src/bin/initlocation/Makefile
+++ b/src/bin/initlocation/Makefile
@@ -7,17 +7,13 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.6 1998/08/22 05:19:25 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.7 1999/06/04 21:12:06 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ../..
 include ../../Makefile.global
 
-SEDSCRIPT= \
-    -e "s^PG_OPT_NAMEDATALEN_PARAM^$(NAMEDATALEN)^g" \
-    -e "s^PG_OPT_OIDNAMELEN_PARAM^$(OIDNAMELEN)^g" 
-
 all: initlocation
 
 initlocation: initlocation.sh

diff --git a/src/include/postgres_ext.h b/src/include/postgres_ext.h
index c09606a10713cc1811e28f15045d185345370989..7e73539912ab6638a2200843124a55a43661e315 100644 (file)
--- a/src/include/postgres_ext.h
+++ b/src/include/postgres_ext.h
@@ -16,7 +16,7 @@
  *     use header files that are otherwise internal to Postgres to interface
  *     with the backend.
  *
- * $Id: postgres_ext.h,v 1.3 1999/02/13 23:20:47 momjian Exp $
+ * $Id: postgres_ext.h,v 1.4 1999/06/04 21:12:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,7 +33,4 @@ typedef unsigned int Oid;
  */
 #define NAMEDATALEN 32
 
-/* OIDNAMELEN should be set to NAMEDATALEN + sizeof(Oid) */
-#define OIDNAMELEN     36
-
 #endif