More timezone build adjustments.

This commit is contained in:
Bruce Momjian 2004-04-30 17:52:07 +00:00
parent 46050a3b75
commit 1360fe4096
3 changed files with 4 additions and 8 deletions

View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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 *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_asctime(const struct tm *);
extern char *pg_ctime(const time_t *); extern char *pg_ctime(const time_t *);
extern double pg_difftime(const time_t, const time_t); extern double pg_difftime(const time_t, const time_t);

View File

@ -4,7 +4,7 @@
# Makefile for the timezone library # Makefile for the timezone library
# IDENTIFICATION # 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) $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
install: zic install: zic
zic -d $(datadir)/timezone $(TZDATAFILES) zic -d $(pkglibdir)/../timezone $(TZDATAFILES)
clean distclean maintainer-clean: clean distclean maintainer-clean:
rm -f SUBSYS.o $(OBJS) $(ZICOBJS) rm -f SUBSYS.o $(OBJS) $(ZICOBJS)

View File

@ -88,11 +88,7 @@ static char privatehid[] = "@(#)private.h 7.53";
#include "errno.h" #include "errno.h"
#include "string.h" #include "string.h"
#include "limits.h" /* for CHAR_BIT */ #include "limits.h" /* for CHAR_BIT */
#define _timezone timezone
#undef timezone
#include "time.h" #include "time.h"
#define timezone _timezone
#undef _timezone
#include "stdlib.h" #include "stdlib.h"
#if HAVE_GETTEXT - 0 #if HAVE_GETTEXT - 0