summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2004-04-30 17:52:07 +0000
committerBruce Momjian2004-04-30 17:52:07 +0000
commit20a5e64a12d80e7793cfa068b6818fb871eb0535 (patch)
tree1ab1334a769f99da4109d65f921897cd3a8e9e3b
parent1a86cc380df4ca358b86c7df8a8fdabcbf273975 (diff)
More timezone build adjustments.
-rw-r--r--src/include/port.h2
-rw-r--r--src/timezone/Makefile2
-rw-r--r--src/timezone/private.h4
3 files changed, 2 insertions, 6 deletions
diff --git a/src/include/port.h b/src/include/port.h
index 588dea12c8..149eb805fd 100644
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -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 c371d8861d..ce42c1bcf1 100644
--- a/src/timezone/Makefile
+++ b/src/timezone/Makefile
@@ -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 4c94b2d21e..c8f4548683 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