Remove NULL_PATCH define

5 files changed, 4 insertions, 17 deletions

diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 9e2ab7937fa..077bfd639b6 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.10 1996/11/04 04:19:41 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.11 1996/11/04 04:35:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1234,11 +1234,9 @@ make_targetlist_expr(ParseState *pstate,
 	 elog(WARN, "make_targetlist_expr: invalid use of NULL expression");
 
      type_id = exprType(expr);
-#ifdef NULL_PATCH
      if (!type_id) {
 	 type_len = 0;
      } else
-#endif
      type_len = tlen(get_id_type(type_id));
 
      /* I have no idea what the following does! */
diff --git a/src/backend/parser/catalog_utils.c b/src/backend/parser/catalog_utils.c
index cf7cb46ad88..4194699f9f7 100644
--- a/src/backend/parser/catalog_utils.c
+++ b/src/backend/parser/catalog_utils.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.5 1996/10/31 05:54:27 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.6 1996/11/04 04:35:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -472,10 +472,8 @@ oper(char *op, int arg1, int arg2)
     CandidateList candidates;
     int ncandidates;
 
-#ifdef NULL_PATCH
     if (!arg2) arg2=arg1;
     if (!arg1) arg1=arg2;
-#endif
 
     if (!(tup = SearchSysCacheTuple(OPRNAME,
 				    PointerGetDatum(op),
diff --git a/src/backend/parser/parse_query.c b/src/backend/parser/parse_query.c
index 179186d5d70..bcd88bc2423 100644
--- a/src/backend/parser/parse_query.c
+++ b/src/backend/parser/parse_query.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/parser/Attic/parse_query.c,v 1.5 1996/10/30 02:01:59 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/parser/Attic/parse_query.c,v 1.6 1996/11/04 04:35:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -651,11 +651,7 @@ make_const(Value *value)
 
 	    /* null const */
 	    con = makeConst(0, 0, (Datum)NULL, TRUE, 0, FALSE);
-#ifdef NULL_PATCH
 	    return con;
-#else
-	    return NULL /*con*/;
-#endif
 	}
     }
 
diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index 09f4fd6363a..c0b1747d54f 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.3 1996/10/31 11:09:44 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.4 1996/11/04 04:35:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -302,10 +302,8 @@ parser_typecast2(Node *expr, int exprType, Type tp, int typlen)
     Assert(IsA(expr,Const));
     
     switch (exprType) {
-#ifdef NULL_PATCH
       case 0: /* NULL */
 	break;
-#endif
     case 23: /* int4 */
 	const_string = (char *) palloc(256);
 	string_palloced = true;
@@ -356,7 +354,6 @@ parser_typecast2(Node *expr, int exprType, Type tp, int typlen)
 	elog(WARN,"unknown type%d ",exprType);
     }
     
-#ifdef NULL_PATCH
     if (!exprType) {
 	adt = makeConst((Oid)typeid(tp),
 			(Size) 0,
@@ -366,7 +363,6 @@ parser_typecast2(Node *expr, int exprType, Type tp, int typlen)
 			0 	/* not a set */);
 	return ((Node*) adt);
     }
-#endif
 
     cp = instr2 (tp, const_string, typlen);
     
diff --git a/src/include/config.h b/src/include/config.h
index 5332d04213d..07de8ef2370 100644
--- a/src/include/config.h
+++ b/src/include/config.h
@@ -180,7 +180,6 @@
 
 /* found in src/backend/utils/adt/arrayfuncs.c */
 /* #define LOARRAY */
-#define NULL_PATCH
 #define OPENLINK_PATCHES
 
 /* This is the time, in seconds, at which a given backend server