From 573f4500a31365c81cfd9c89afab257bacf79a1b Mon Sep 17 00:00:00 2001
From: Michael Meskes <meskes@postgresql.org>
Date: Wed, 10 Sep 2003 18:03:08 +0000
Subject: [PATCH] Some uppercase type definitions were left.

---
 src/interfaces/ecpg/ChangeLog               | 10 +++++++++
 src/interfaces/ecpg/compatlib/informix.c    | 18 ++++++++--------
 src/interfaces/ecpg/include/ecpg_informix.h | 24 ++++++++++-----------
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 31e67351ff..902b73fd8b 100644
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -1612,6 +1612,16 @@ Tue Aug 26 18:06:45 CEST 2003
 Mon Sep  1 14:33:10 CEST 2003
 
 	- Fixed two bugs in numeric library.
+
+Tue Sep  9 12:13:51 CEST 2003
+
+	- Added Dave patch for Informix handling of numeric/int conversion.
+	- Changed all new datatypes to lowercase.
+	- Fixed rounding bug in numerical types.
+	
+Wed Sep 10 20:01:49 CEST 2003
+
+	- Some files still had uppercase typenames
 	- Set ecpg version to 3.0.0
 	- Set ecpg library to 4.0.0
 	- Set pgtypes library to 1.0.0
diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c
index c7017e286d..9c4f41bde3 100644
--- a/src/interfaces/ecpg/compatlib/informix.c
+++ b/src/interfaces/ecpg/compatlib/informix.c
@@ -426,7 +426,7 @@ dectolong(decimal * np, long *lngp)
 
 /* Now the date functions */
 int
-rdatestr(Date d, char *str)
+rdatestr(date d, char *str)
 {
 	char	   *tmp = PGTYPESdate_to_asc(d);
 
@@ -441,9 +441,9 @@ rdatestr(Date d, char *str)
 }
 
 int
-rstrdate(char *str, Date * d)
+rstrdate(char *str, date * d)
 {
-	Date		dat = PGTYPESdate_from_asc(str, NULL);
+	date		dat = PGTYPESdate_from_asc(str, NULL);
 
 	if (errno != PGTYPES_DATE_BAD_DATE && dat == 0)
 		return -1218;
@@ -453,14 +453,14 @@ rstrdate(char *str, Date * d)
 }
 
 void
-rtoday(Date * d)
+rtoday(date * d)
 {
 	PGTYPESdate_today(d);
 	return;
 }
 
 int
-rjulmdy(Date d, short mdy[3])
+rjulmdy(date d, short mdy[3])
 {
 	int			mdy_int[3];
 
@@ -472,7 +472,7 @@ rjulmdy(Date d, short mdy[3])
 }
 
 int
-rdefmtdate(Date * d, char *fmt, char *str)
+rdefmtdate(date * d, char *fmt, char *str)
 {
 	/* TODO: take care of DBCENTURY environment variable */
 	/* PGSQL functions allow all centuries */
@@ -497,7 +497,7 @@ rdefmtdate(Date * d, char *fmt, char *str)
 }
 
 int
-rfmtdate(Date d, char *fmt, char *str)
+rfmtdate(date d, char *fmt, char *str)
 {
 	if (PGTYPESdate_fmt_asc(d, fmt, str) == 0)
 		return 0;
@@ -509,7 +509,7 @@ rfmtdate(Date d, char *fmt, char *str)
 }
 
 int
-rmdyjul(short mdy[3], Date * d)
+rmdyjul(short mdy[3], date * d)
 {
 	int			mdy_int[3];
 
@@ -521,7 +521,7 @@ rmdyjul(short mdy[3], Date * d)
 }
 
 int
-rdayofweek(Date d)
+rdayofweek(date d)
 {
 	return (PGTYPESdate_dayofweek(d));
 }
diff --git a/src/interfaces/ecpg/include/ecpg_informix.h b/src/interfaces/ecpg/include/ecpg_informix.h
index b5c8ed4884..1b71735e79 100644
--- a/src/interfaces/ecpg/include/ecpg_informix.h
+++ b/src/interfaces/ecpg/include/ecpg_informix.h
@@ -8,18 +8,18 @@
 
 #define SQLNOTFOUND 100
 
-#ifndef Date
-#define Date long
-#endif   /* ! Date */
+#ifndef date
+#define date long
+#endif   /* ! date */
 
-extern int	rdatestr(Date, char *);
-extern void rtoday(Date *);
-extern int	rjulmdy(Date, short *);
-extern int	rdefmtdate(Date *, char *, char *);
-extern int	rfmtdate(Date, char *, char *);
-extern int	rmdyjul(short *, Date *);
-extern int	rstrdate(char *, Date *);
-extern int	rdayofweek(Date);
+extern int	rdatestr(date, char *);
+extern void rtoday(date *);
+extern int	rjulmdy(date, short *);
+extern int	rdefmtdate(date *, char *, char *);
+extern int	rfmtdate(date, char *, char *);
+extern int	rmdyjul(short *, date *);
+extern int	rstrdate(char *, date *);
+extern int	rdayofweek(date);
 
 extern int	rfmtlong(long, char *, char *);
 extern int	rgetmsg(int, char *, int);
@@ -28,7 +28,7 @@ extern int	rsetnull(int, char *);
 extern int	rtypalign(int, int);
 extern int	rtypmsize(int, int);
 extern int	rtypwidth(int, int);
-extern void rupshift(char *);
+extern void 	rupshift(char *);
 
 extern int	byleng(char *, int);
 extern void ldchar(char *, int, char *);