mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-03-07 19:47:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

ecpg: Move function prototype into header file

Browse Source 
PGTYPEStimestamp_defmt_scan() was declared twice inside different .c
files, with slightly different prototypes.  Move it into a header file
and correct the prototype.
This commit is contained in:
Peter Eisentraut 2013-07-22 21:02:56 -04:00
parent 2f1fa75a0c
commit 9feeef92fb
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/ecpg/pgtypeslib/dt.h
View File

@ -348,6 +348,10 @@ void GetCurrentDateTime(struct tm *);
int date2j(int, int, int);
void TrimTrailingZeros(char *);
void dt2time(double, int *, int *, int *, fsec_t *);
int PGTYPEStimestamp_defmt_scan(char **str, char *fmt, timestamp * d,
int *year, int *month, int *day,
int *hour, int *minute, int *second,
int *tz);
extern char *pgtypes_date_weekdays_short[];
extern char *pgtypes_date_months[];

3
src/interfaces/ecpg/pgtypeslib/dt_common.c
View File

@ -2595,9 +2595,6 @@ pgtypes_defmt_scan(union un_fmt_comb * scan_val, int scan_type, char **pstr, cha
}
/* XXX range checking */
int PGTYPEStimestamp_defmt_scan(char **, char *, timestamp *, int *, int *, int *,
int *, int *, int *, int *);
int
PGTYPEStimestamp_defmt_scan(char **str, char *fmt, timestamp * d,
int *year, int *month, int *day,

3
src/interfaces/ecpg/pgtypeslib/timestamp.c
View File

@ -18,9 +18,6 @@
#include "pgtypes_date.h"
int PGTYPEStimestamp_defmt_scan(char **, const char *, timestamp *, int *, int *, int *,
int *, int *, int *, int *);
#ifdef HAVE_INT64_TIMESTAMP
static int64
time2t(const int hour, const int min, const int sec, const fsec_t fsec)