2 files changed, 13 insertions, 7 deletions
diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h
index 4162cd6d234..4e3c784c0dc 100644
--- a/src/include/parser/parse_oper.h
+++ b/src/include/parser/parse_oper.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_oper.h,v 1.11 2000/01/26 05:58:27 momjian Exp $
+ * $Id: parse_oper.h,v 1.12 2000/11/16 22:30:45 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,10 +18,13 @@
 
 typedef HeapTuple Operator;
 
-extern Oid	any_ordering_op(Oid restype);
-extern Oid	oprid(Operator op);
-extern Operator oper(char *op, Oid arg1, Oid arg2, bool noWarnings);
+extern Operator oper(char *op, Oid arg1, Oid arg2, bool noError);
 extern Operator right_oper(char *op, Oid arg);
 extern Operator left_oper(char *op, Oid arg);
 
+extern Oid	oper_oid(char *op, Oid arg1, Oid arg2, bool noError);
+extern Oid	oprid(Operator op);
+
+extern Oid	any_ordering_op(Oid restype);
+
 #endif	 /* PARSE_OPER_H */
diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h
index e2cfd7f4a2d..0d8ba2f1bce 100644
--- a/src/include/parser/parse_type.h
+++ b/src/include/parser/parse_type.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_type.h,v 1.14 2000/06/08 22:37:53 momjian Exp $
+ * $Id: parse_type.h,v 1.15 2000/11/16 22:30:45 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,15 +21,18 @@ typedef HeapTuple Type;
 extern bool typeidIsValid(Oid id);
 extern Type typeidType(Oid id);
 extern Type typenameType(char *s);
-extern char *typeidTypeName(Oid id);
+
 extern Oid	typeTypeId(Type tp);
 extern int16 typeLen(Type t);
 extern bool typeByVal(Type t);
 extern char *typeTypeName(Type t);
 extern char typeTypeFlag(Type t);
+extern Oid	typeTypeRelid(Type typ);
 extern Datum stringTypeDatum(Type tp, char *string, int32 atttypmod);
+
+extern char *typeidTypeName(Oid id);
 extern Oid	typeidTypeRelid(Oid type_id);
-extern Oid	typeTypeRelid(Type typ);
+extern Oid	typenameTypeId(char *s);
 
 #define ISCOMPLEX(typeid) (typeidTypeRelid(typeid) != InvalidOid)