diff options
| -rw-r--r-- | src/include/port.h | 4 | ||||
| -rw-r--r-- | src/timezone/Makefile | 4 | ||||
| -rw-r--r-- | src/timezone/private.h | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/include/port.h b/src/include/port.h index f6d37d3bed1..4fb42bf74dd 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/port.h,v 1.26 2004/04/30 04:14:05 momjian Exp $ + * $PostgreSQL: pgsql/src/include/port.h,v 1.27 2004/04/30 17:52:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -201,7 +201,7 @@ extern int pqGethostbyname(const char *name, extern struct tm *pg_localtime(const time_t *); -extern struct tm *gg_gmtime(const time_t *); +extern struct tm *pg_gmtime(const time_t *); extern char *pg_asctime(const struct tm *); extern char *pg_ctime(const time_t *); extern double pg_difftime(const time_t, const time_t); diff --git a/src/timezone/Makefile b/src/timezone/Makefile index 631f81f169a..22639a4e4a6 100644 --- a/src/timezone/Makefile +++ b/src/timezone/Makefile @@ -4,7 +4,7 @@ # Makefile for the timezone library # IDENTIFICATION -# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.4 2004/04/30 16:08:01 momjian Exp $ +# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.5 2004/04/30 17:52:07 momjian Exp $ # #------------------------------------------------------------------------- @@ -30,7 +30,7 @@ zic: $(ZICOBJS) $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X) install: zic - zic -d $(datadir)/timezone $(TZDATAFILES) + zic -d $(pkglibdir)/../timezone $(TZDATAFILES) clean distclean maintainer-clean: rm -f SUBSYS.o $(OBJS) $(ZICOBJS) diff --git a/src/timezone/private.h b/src/timezone/private.h index 4c94b2d21e5..c8f45486837 100644 --- a/src/timezone/private.h +++ b/src/timezone/private.h @@ -88,11 +88,7 @@ static char privatehid[] = "@(#)private.h 7.53"; #include "errno.h" #include "string.h" #include "limits.h" /* for CHAR_BIT */ -#define _timezone timezone -#undef timezone #include "time.h" -#define timezone _timezone -#undef _timezone #include "stdlib.h" #if HAVE_GETTEXT - 0 |