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 de1c77383e64528332d0beda463f074fbdae4a49..e1fb09e4136b58082fe673522cf3c9a0ce04614a 100644 (file)
--- a/src/backend/catalog/genbki.sh.in
+++ b/src/backend/catalog/genbki.sh.in
@@ -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 3fa6fdb7aa3300a5bde0bc63af32ed6cb2514e5d..b88f520939c16de01a18f0ea7786485a00babe8a 100644 (file)
--- a/src/bin/initlocation/Makefile
+++ b/src/bin/initlocation/Makefile
@@ -14,10 +14,6 @@
 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 c2b1a9f52f16c3c89181a5799fc646b901a32db2..50165548090c4ff17c66873372fd2d98536f0a05 100644 (file)
--- a/src/include/postgres_ext.h
+++ b/src/include/postgres_ext.h
@@ -33,7 +33,4 @@ typedef unsigned int Oid;
  */
 #define NAMEDATALEN 32
 
-/* OIDNAMELEN should be set to NAMEDATALEN + sizeof(Oid) */
-#define OIDNAMELEN     36
-
 #endif