Add prototypes for oracle-compat functions. Rename geo-*.c adt to geo_*.c

diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
index 359a3ad8c86204ca88a0bbff5309ae88192807ed..9dff84b5bb7c0122448b6a93282ffb91da526160 100644 (file)
--- a/src/backend/utils/adt/Makefile
+++ b/src/backend/utils/adt/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/adt
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.4 1997/03/04 05:32:04 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.5 1997/03/09 20:40:50 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -18,7 +18,7 @@ INCLUDE_OPT = -I../.. \
 CFLAGS+=$(INCLUDE_OPT)
 
 OBJS = acl.o arrayfuncs.o arrayutils.o bool.o char.o chunk.o date.o \
-   datum.o dt.o filename.o float.o geo-ops.o geo-selfuncs.o int.o \
+   datum.o dt.o filename.o float.o geo_ops.o geo_selfuncs.o int.o \
    misc.o nabstime.o name.o not_in.o numutils.o oid.o \
    oidname.o oidint2.o oidint4.o oracle_compat.o \
    regexp.o regproc.o selfuncs.o \

diff --git a/src/backend/utils/adt/geo-ops.c b/src/backend/utils/adt/geo_ops.c
similarity index 99%
rename from src/backend/utils/adt/geo-ops.c
rename to src/backend/utils/adt/geo_ops.c
index c41654b44615448839672eafe3cf109a943bcc3e..48d60ce90305601f82024a1e3c4de863b12bd09b 100644 (file)
--- a/src/backend/utils/adt/geo-ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/geo-ops.c,v 1.3 1996/11/03 06:53:06 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.1 1997/03/09 20:40:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */

diff --git a/src/backend/utils/adt/geo-selfuncs.c b/src/backend/utils/adt/geo_selfuncs.c
similarity index 95%
rename from src/backend/utils/adt/geo-selfuncs.c
rename to src/backend/utils/adt/geo_selfuncs.c
index 77454064cd6f1ff47e8599c0be5ea20c8fc722ce..a4d3eccb51d59a0e55967f2dd7b17d668285e3ff 100644 (file)
--- a/src/backend/utils/adt/geo-selfuncs.c
+++ b/src/backend/utils/adt/geo_selfuncs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/geo-selfuncs.c,v 1.2 1996/11/10 03:03:13 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.1 1997/03/09 20:40:57 momjian Exp $
  *
  * XXX These are totally bogus.
  *

diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index e59120ccb4ee938b1547d4f095f556e44acd6ec0..fd2448f070a2c0877b0106a44aed68cd6992e700 100644 (file)
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -1,7 +1,7 @@
 /*
  *  Edmund Mergl <E.Mergl@bawue.de>
  *
- *  $Id: oracle_compat.c,v 1.1 1997/03/04 05:32:06 scrappy Exp $
+ *  $Id: oracle_compat.c,v 1.2 1997/03/09 20:40:58 momjian Exp $
  *
  */
 
@@ -9,6 +9,7 @@
 #include <ctype.h>
 #include "postgres.h"
 
+#include "utils/builtins.h"    /* where function declarations go */
 
 /********************************************************************
  *

diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 6a896a492af1642dee566ece07d09ce7bb9500a9..0e28192a216f9a687f7329de4fdb1faa8e28de43 100644 (file)
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.9 1997/02/19 20:11:05 momjian Exp $
+ * $Id: builtins.h,v 1.10 1997/03/09 20:41:02 momjian Exp $
  *
  * NOTES
  *    This should normally only be included by fmgr.h.
@@ -486,6 +486,18 @@ extern bool textlike(struct varlena *s, struct varlena *p);
 extern bool textnlike(struct varlena *s, struct varlena *p);
 extern int like(char *text, char *p);
 
+/* oracle_compat.c */
+
+extern text *lower(text *string);
+extern text *upper(text *string);
+extern text *initcap(text *string);
+extern text *lpad(text *string1, int4 len, text *string2);
+extern text *rpad(text *string1, int4 len, text *string2);
+extern text *ltrim(text *string, text *set);
+extern text *rtrim(text *string, text *set);
+extern text *substr(text *string, int4 m, int4 n);
+extern text *translate(text *string, char from, char to);
+
 /* acl.c */
 
 #endif /* BUILTINS_H */