Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit a3a648e

Browse files
author
Michael Meskes
committed
Sorry, accidently committed a patch I'm working on. Reverting it.
The only correct change was: - Added SQLSTATE macro closing bug #3961.
1 parent 78772dc commit a3a648e

File tree

4 files changed

+9
-14
lines changed

4 files changed

+9
-14
lines changed
+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/datetime.h,v 1.13 2008/02/14 12:22:36 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/datetime.h,v 1.14 2008/02/14 12:27:26 meskes Exp $ */
22

33
#ifndef _ECPG_DATETIME_H
44
#define _ECPG_DATETIME_H
55

66
#include <ecpg_informix.h>
77

8-
/* typedef timestamp dtime_t;
9-
typedef interval intrvl_t;*/
8+
typedef timestamp dtime_t;
9+
typedef interval intrvl_t;
1010

1111
#endif /* ndef _ECPG_DATETIME_H */

src/interfaces/ecpg/include/decimal.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/decimal.h,v 1.15 2008/02/14 12:22:36 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/decimal.h,v 1.16 2008/02/14 12:27:26 meskes Exp $ */
22

33
#ifndef _ECPG_DECIMAL_H
44
#define _ECPG_DECIMAL_H
55

66
#include <ecpg_informix.h>
77

8-
/* typedef decimal dec_t; */
8+
typedef decimal dec_t;
99

1010
#endif /* ndef _ECPG_DECIMAL_H */

src/interfaces/ecpg/include/ecpg_informix.h

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file contains stuff needed to be as compatible to Informix as possible.
3-
* $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpg_informix.h,v 1.19 2008/02/14 12:22:36 meskes Exp $
3+
* $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpg_informix.h,v 1.20 2008/02/14 12:27:26 meskes Exp $
44
*/
55
#ifndef _ECPG_INFORMIX_H
66
#define _ECPG_INFORMIX_H
@@ -82,11 +82,6 @@ extern int dttofmtasc(timestamp *, char *, int, char *);
8282
extern int intoasc(interval *, char *);
8383
extern int dtcvfmtasc(char *, char *, timestamp *);
8484

85-
/* we also define Informix datatypes here */
86-
typedef timestamp dtime_t;
87-
typedef interval intrvl_t;
88-
typedef decimal dec_t;
89-
9085
#ifdef __cplusplus
9186
}
9287
#endif

src/interfaces/ecpg/preproc/pgc.l

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.160 2008/02/14 12:22:36 meskes Exp $
15+
* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.161 2008/02/14 12:27:26 meskes Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -1320,7 +1320,7 @@ static bool isdefine(void)
13201320

13211321
static bool isinformixdefine(void)
13221322
{
1323-
/* const char *new = NULL;
1323+
const char *new = NULL;
13241324

13251325
if (strcmp(yytext, "dec_t") == 0)
13261326
new = "decimal";
@@ -1344,7 +1344,7 @@ static bool isinformixdefine(void)
13441344
yy_scan_string(new);
13451345
return true;
13461346
}
1347-
*/
1347+
13481348
return false;
13491349
}
13501350

0 commit comments

Comments
 (0)