From 86a83319358303dd891e9e1b3bb69d56c1983adb Mon Sep 17 00:00:00 2001
From: Michael Meskes <meskes@postgresql.org>
Date: Sun, 15 Jun 2003 11:10:09 +0000
Subject: [PATCH] Some minor changes for new version numbering.
---
src/interfaces/ecpg/ChangeLog | 9 +++++++--
src/interfaces/ecpg/ecpglib/Makefile | 4 ++--
src/interfaces/ecpg/include/ecpgtype.h | 20 ++++++++++----------
3 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 284b94f2baf..416081aa1bc 100644
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -1487,8 +1487,13 @@ Fri Jun 13 10:11:12 CEST 2003
- Enable FETCH without INTO.
- Compatibility functions for INFORMIX handling of DECLARE statement.
- - Set ecpg version to 2.12.0.
- - Set ecpg library to 3.4.2.
+
+Sun Jun 15 11:18:58 CEST 2003
+
+ - Applied multi-threading patch by Lee Kindess <lkindness@csl.co.uk>
+ - Changed order of types in enum to make working with these easier.
+ - Set ecpg version to 3.0.0
+ - Set ecpg library to 4.0.0
- Set pgtypes library to 1.0.0
- Set compat library to 1.0.0
diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile
index 68f1a2273d1..f7e5135f645 100644
--- a/src/interfaces/ecpg/ecpglib/Makefile
+++ b/src/interfaces/ecpg/ecpglib/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.4 2003/06/15 04:07:58 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.5 2003/06/15 11:10:09 meskes Exp $
#
#-------------------------------------------------------------------------
@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
NAME= ecpg
SO_MAJOR_VERSION= 4
-SO_MINOR_VERSION= 1.1
+SO_MINOR_VERSION= 0.1
override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) $(CPPFLAGS) $(THREAD_CFLAGS)
diff --git a/src/interfaces/ecpg/include/ecpgtype.h b/src/interfaces/ecpg/include/ecpgtype.h
index 32dd84aafc0..51f090c8443 100644
--- a/src/interfaces/ecpg/include/ecpgtype.h
+++ b/src/interfaces/ecpg/include/ecpgtype.h
@@ -40,22 +40,22 @@ enum ECPGttype
{
ECPGt_char = 1, ECPGt_unsigned_char, ECPGt_short, ECPGt_unsigned_short,
ECPGt_int, ECPGt_unsigned_int, ECPGt_long, ECPGt_unsigned_long,
+ ECPGt_long_long, ECPGt_unsigned_long_long,
ECPGt_bool,
ECPGt_float, ECPGt_double,
ECPGt_varchar, ECPGt_varchar2,
+ ECPGt_numeric,
+ ECPGt_date,
+ ECPGt_timestamp,
+ ECPGt_interval,
ECPGt_array,
ECPGt_struct,
ECPGt_union,
+ ECPGt_descriptor, /* sql descriptor, no C variable */
ECPGt_char_variable,
- ECPGt_EOIT, /* End of insert types. */
- ECPGt_EORT, /* End of result types. */
- ECPGt_NO_INDICATOR, /* no indicator */
- ECPGt_long_long, ECPGt_unsigned_long_long,
- ECPGt_descriptor, /* sql descriptor, no C variable */
- ECPGt_numeric,
- ECPGt_date,
- ECPGt_timestamp,
- ECPGt_interval
+ ECPGt_EOIT, /* End of insert types. */
+ ECPGt_EORT, /* End of result types. */
+ ECPGt_NO_INDICATOR /* no indicator */
};
/* descriptor items */
@@ -80,7 +80,7 @@ enum ECPGdtype
ECPGd_cardinality
};
-#define IS_SIMPLE_TYPE(type) (((type) >= ECPGt_char && (type) <= ECPGt_varchar2) || ((type)>=ECPGt_long_long && (type) <= ECPGt_unsigned_long_long) || (type) >= ECPGt_numeric)
+#define IS_SIMPLE_TYPE(type) ((type) >= ECPGt_char && (type) <= ECPGt_interval)
#ifdef __cplusplus
}
--
GitLab