* Makefile.in (OBSOLETE_FUNCTIONS): Add timezone.

	* include/cygwin/time.h: Drop conditional timezone definitions.
	(timezone): Declare as extern symbol referring _timezone variable.

3 files changed, 485 insertions, 7 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 701433fab61..dcad1367400 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-01  Corinna Vinschen  <corinna@vinschen.de>
+	    Brian Dessent <brian@dessent.net>
+
+	* Makefile.in (OBSOLETE_FUNCTIONS): Add timezone.
+	* include/cygwin/time.h: Drop conditional timezone definitions.
+	(timezone): Declare as extern symbol referring _timezone variable.
+
 2007-11-27  Corinna Vinschen  <corinna@vinschen.de>
 
 	Drop old SetResourceLock stuff in favor of mutos.
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
new file mode 100644
index 00000000000..f4a6b3f6966
--- /dev/null
+++ b/winsup/cygwin/Makefile.in
@@ -0,0 +1,476 @@
+# Makefile.in for Cygwin.
+# Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Red Hat, Inc.
+#
+# This file is part of Cygwin.
+#
+# This software is a copyrighted work licensed under the terms of the
+# Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
+# details.
+
+# This makefile requires GNU make.
+
+SHELL:=@SHELL@
+srcdir:=@srcdir@
+objdir:=.
+
+CONFIG_DIR:=$(srcdir)/config/@CONFIG_DIR@
+VPATH:=$(srcdir):$(CONFIG_DIR):$(srcdir)/regex:$(srcdir)/regexp:$(srcdir)/lib:$(srcdir)/libc
+
+target_alias:=@target_alias@
+build_alias:=@build_alias@
+host_alias:=@host_alias@
+prefix:=@prefix@
+
+program_transform_name:=@program_transform_name@
+exec_prefix:=@exec_prefix@
+bindir:=@bindir@
+libdir:=@libdir@
+mandir:=@mandir@
+ifeq ($(target_alias),$(host_alias))
+ifeq ($(build_alias),$(host_alias))
+tooldir:=$(exec_prefix)
+else
+tooldir:=$(exec_prefix)/$(target_alias)
+endif
+else
+tooldir:=$(exec_prefix)/$(target_alias)
+endif
+datadir:=@datadir@
+infodir:=@infodir@
+includedir:=@includedir@
+
+override INSTALL:=@INSTALL@
+override INSTALL_PROGRAM:=@INSTALL_PROGRAM@
+override INSTALL_DATA:=@INSTALL_DATA@
+
+#
+# --enable options from configure
+#
+MT_SAFE:=@MT_SAFE@
+DEFS:=@DEFS@
+CCEXTRA:=
+CC:=@CC@
+# FIXME: Which is it, CC or CC_FOR_TARGET?
+CC_FOR_TARGET:=$(CC)
+CFLAGS=@CFLAGS@
+override CFLAGS+=-MMD ${$(*F)_CFLAGS} -fmerge-constants -ftracer $(CCEXTRA)
+CXX=@CXX@
+override CXXFLAGS=@CXXFLAGS@
+
+AR:=@AR@
+AR_FLAGS:=qv
+RANLIB:=@RANLIB@
+LD:=@LD@
+DLLTOOL:=@DLLTOOL@
+WINDRES:=@WINDRES@
+AS:=@AS@
+NM:=@NM@
+OBJCOPY:=@OBJCOPY@
+OBJDUMP:=@OBJDUMP@
+STRIP:=@STRIP@
+LDSCRIPT:=cygwin.sc
+MKDIRP:=$(INSTALL) -m 755 -d
+
+#
+# Include common definitions for winsup directory
+#
+include $(srcdir)/../Makefile.common
+
+@SET_MAKE@
+
+# Setup the testing framework, if you have one
+EXPECT = `if [ -f $${rootme}/../../expect/expect$(EXEEXT) ] ; then \
+	    echo $${rootme}/../../expect/expect$(EXEEXT) ; \
+	  else echo expect ; fi`
+
+RUNTEST = `if [ -f $${srcdir}/../dejagnu/runtest ] ; then \
+	       echo $${srcdir}/../dejagnu/runtest ; \
+	    else echo runtest; fi`
+RUNTESTFLAGS =
+
+# Parameters used in building the cygwin.dll.
+# We build as cygwin0.dll and rename at install time to overcome
+# native rebuilding issues (we don't want the build tools to see a partially
+# built cygwin.dll and attempt to use it instead of the old one).
+
+DLL_NAME:=cygwin1.dll
+TEST_DLL_NAME:=cygwin0.dll
+TEST_LIB_NAME:=libcygwin0.a
+DEF_FILE:=cygwin.def
+DLL_ENTRY:=@DLL_ENTRY@
+
+LIBGMON_A:=libgmon.a
+CYGWIN_START:=crt0.o
+GMON_START:=gcrt0.o
+
+# Some things want these from libc, but they have their own static
+# data which apps can get to, which is a pain in the dll, so we
+# include them directly into the library.
+
+LIBCOS:=${sort ${addsuffix .o,${basename ${notdir ${wildcard $(srcdir)/lib/*.c}}}} \
+	       ${addsuffix .o,${basename ${notdir ${wildcard $(srcdir)/lib/*.cc}}}}}
+
+# Build all source files in the config directory
+
+EXTRA_DLL_OFILES:=${addsuffix .o,${basename ${notdir ${wildcard $(CONFIG_DIR)/*.c}}}}
+
+EXTRA_OFILES=$(bupdir1)/libiberty/random.o
+
+MALLOC_OFILES=@MALLOC_OFILES@
+
+DLL_IMPORTS:=$(w32api_lib)/libkernel32.a $(w32api_lib)/libadvapi32.a
+
+MT_SAFE_OBJECTS:=
+# Please maintain this list in sorted order, with maximum files per 86 col line
+#
+DLL_OFILES:=assert.o autoload.o bsdlib.o ctype.o cxx.o cygheap.o cygthread.o \
+	cygtls.o dcrt0.o debug.o delqueue.o devices.o dir.o dlfcn.o dll_init.o \
+	dtable.o environ.o errno.o exceptions.o exec.o external.o fcntl.o \
+	fhandler.o fhandler_clipboard.o fhandler_console.o fhandler_disk_file.o \
+	fhandler_dsp.o fhandler_fifo.o fhandler_floppy.o fhandler_mailslot.o \
+	fhandler_mem.o fhandler_netdrive.o fhandler_nodevice.o fhandler_proc.o \
+	fhandler_process.o fhandler_random.o fhandler_raw.o fhandler_registry.o \
+	fhandler_serial.o fhandler_socket.o fhandler_tape.o fhandler_termios.o \
+	fhandler_tty.o fhandler_virtual.o fhandler_windows.o fhandler_zero.o \
+	flock.o fnmatch.o fork.o fts.o ftw.o getopt.o glob.o grp.o heap.o \
+	hookapi.o inet_addr.o inet_network.o init.o ioctl.o ipc.o iruserok.o \
+	localtime.o lsearch.o malloc_wrapper.o memmem.o miscfuncs.o mktemp.o \
+	mmap.o msg.o net.o netdb.o nftw.o ntea.o passwd.o path.o pinfo.o pipe.o \
+	poll.o pthread.o regcomp.o regerror.o regexec.o regfree.o registry.o \
+	resource.o rexec.o scandir.o sched.o sec_acl.o sec_helper.o security.o \
+	select.o sem.o shared.o shm.o sigfe.o signal.o sigproc.o smallprint.o \
+	spawn.o strace.o strptime.o strsep.o strsig.o sync.o syscalls.o \
+	sysconf.o syslog.o termios.o thread.o timelocal.o timer.o times.o tty.o \
+	uinfo.o uname.o v8_regexp.o v8_regerror.o v8_regsub.o wait.o wincap.o \
+	window.o winf.o \
+	$(EXTRA_DLL_OFILES) $(EXTRA_OFILES) $(MALLOC_OFILES) $(MT_SAFE_OBJECTS)
+
+GMON_OFILES:=gmon.o mcount.o profil.o
+
+OBSOLETE_FUNCTIONS:=regcomp regerror regexec regfree regsub \
+		    open acl aclcheck aclfrommode aclfrompbits \
+		    aclfromtext aclsort acltomode acltopbits \
+		    acltotext chown facl fchown fcntl fdopen fgetpos fopen \
+		    freopen fseeko fsetpos fstat ftello ftruncate \
+		    getegid geteuid getgid getgrent getgrgid getgrnam \
+		    getgroups getpwuid getpwuid_r getuid initgroups \
+		    lchown lseek lstat mknod mmap seekdir setegid seteuid \
+		    setgid setgroups setregid setreuid setuid stat \
+		    telldir tmpfile truncate timezone
+
+NEW_FUNCTIONS:=regcomp posix_regcomp \
+	       regerror posix_regerror \
+	       regexec posix_regexec \
+	       regfree posix_regfree \
+	       open _open64 \
+	       acl _acl32 \
+	       aclcheck _aclcheck32 \
+	       aclfrommode _aclfrommode32 \
+	       aclfrompbits _aclfrompbits32 \
+	       aclfromtext _aclfromtext32 \
+	       aclsort _aclsort32 \
+	       acltomode _acltomode32 \
+	       acltopbits _acltopbits32 \
+	       acltotext _acltotext32 \
+	       chown _chown32 \
+	       facl _facl32 \
+	       fchown _fchown32 \
+	       fcntl _fcntl64 \
+	       fdopen _fdopen64 \
+	       fgetpos _fgetpos64 \
+	       fopen _fopen64 \
+	       freopen _freopen64 \
+	       fseeko _fseeko64 \
+	       fsetpos _fsetpos64 \
+	       fstat _fstat64 \
+	       ftello _ftello64 \
+	       ftruncate _ftruncate64 \
+	       getegid _getegid32 \
+	       geteuid _geteuid32 \
+	       getgid _getgid32 \
+	       getgrent _getgrent32 \
+	       getgrgid _getgrgid32 \
+	       getgrnam _getgrnam32 \
+	       getgroups _getgroups32 \
+	       getpwuid _getpwuid32 \
+	       getpwuid_r _getpwuid_r32 \
+	       getuid _getuid32 \
+	       initgroups _initgroups32 \
+	       lchown _lchown32 \
+	       lseek _lseek64 \
+	       lstat _lstat64 \
+	       mknod _mknod32 \
+	       mmap _mmap64 \
+	       seekdir _seekdir64 \
+	       setegid _setegid32 \
+	       seteuid _seteuid32 \
+	       setgid _setgid32 \
+	       setgroups _setgroups32 \
+	       setregid _setregid32 \
+	       setreuid _setreuid32 \
+	       setuid _setuid32 \
+	       stat _stat64 \
+	       telldir _telldir64 \
+	       tmpfile _tmpfile64 \
+	       truncate _truncate64
+
+API_VER:=$(srcdir)/include/cygwin/version.h
+
+PWD:=${shell pwd}
+LIB_NAME:=$(PWD)/libcygwin.a
+LIBSERVER:=@LIBSERVER@
+SUBLIBS:=$(PWD)/libpthread.a $(PWD)/libutil.a $(PWD)/libm.a $(PWD)/libc.a $(PWD)/libdl.a
+EXTRALIBS:=libautomode.a libbinmode.a libtextmode.a libtextreadmode.a
+INSTOBJS:=automode.o binmode.o textmode.o textreadmode.o
+TARGET_LIBS:=$(LIB_NAME) $(CYGWIN_START) $(GMON_START) $(LIBGMON_A) $(SUBLIBS) $(INSTOBJS) $(EXTRALIBS)
+
+ifneq "${filter -O%,$(CFLAGS)}" ""
+cygheap_CFLAGS:=-fomit-frame-pointer
+cygthread_CFLAGS:=-fomit-frame-pointer
+cygtls_CFLAGS:=-fomit-frame-pointer
+delqueue_CFLAGS:=-fomit-frame-pointer
+devices_CFLAGS:=-fomit-frame-pointer -Os
+dir_CFLAGS:=-fomit-frame-pointer
+dlfcn_CFLAGS:=-fomit-frame-pointer
+dll_init_CFLAGS:=-fomit-frame-pointer
+dtable_CFLAGS:=-fomit-frame-pointer -fcheck-new
+fcntl_CFLAGS:=-fomit-frame-pointer
+fhandler_CFLAGS:=-fomit-frame-pointer
+fhandler_clipboard_CFLAGS:=-fomit-frame-pointer
+fhandler_console_CFLAGS:=-fomit-frame-pointer
+fhandler_disk_file_CFLAGS:=-fomit-frame-pointer
+fhandler_dsp_CFLAGS:=-fomit-frame-pointer
+fhandler_floppy_CFLAGS:=-fomit-frame-pointer
+fhandler_mem_CFLAGS:=-fomit-frame-pointer
+fhandler_netdrive_CFLAGS:=-fomit-frame-pointer
+fhandler_proc_CFLAGS:=-fomit-frame-pointer
+fhandler_process_CFLAGS:=-fomit-frame-pointer
+fhandler_random_CFLAGS:=-fomit-frame-pointer
+fhandler_raw_CFLAGS:=-fomit-frame-pointer
+fhandler_registry_CFLAGS:=-fomit-frame-pointer
+fhandler_serial_CFLAGS:=-fomit-frame-pointer
+fhandler_socket_CFLAGS:=-fomit-frame-pointer
+fhandler_syslog_CFLAGS:=-fomit-frame-pointer
+fhandler_tape_CFLAGS:=-fomit-frame-pointer
+fhandler_termios_CFLAGS:=-fomit-frame-pointer
+fhandler_tty_CFLAGS:=-fomit-frame-pointer
+fhandler_virtual_CFLAGS:=-fomit-frame-pointer
+fhandler_windows_CFLAGS:=-fomit-frame-pointer
+fhandler_zero_CFLAGS:=-fomit-frame-pointer
+flock_CFLAGS:=-fomit-frame-pointer
+grp_CFLAGS:=-fomit-frame-pointer
+malloc_CFLAGS:=-fomit-frame-pointer
+malloc_wrapper_CFLAGS:=-fomit-frame-pointer
+miscfuncs_CFLAGS:=-fomit-frame-pointer
+net_CFLAGS:=-fomit-frame-pointer
+passwd_CFLAGS:=-fomit-frame-pointer
+regcomp_CFLAGS=-fomit-frame-pointer
+regerror_CFLAGS=-fomit-frame-pointer
+regexec_CFLAGS=-fomit-frame-pointer
+regfree_CFLAGS=-fomit-frame-pointer
+shared_CFLAGS:=-fomit-frame-pointer
+sync_CFLAGS:=-fomit-frame-pointer -O3
+smallprint_CFLAGS:=-fomit-frame-pointer
+syscalls_CFLAGS:=-fomit-frame-pointer
+sysconf_CFLAGS:=-fomit-frame-pointer
+uinfo_CFLAGS:=-fomit-frame-pointer
+endif
+
+.PHONY: all force dll_ofiles install all_target install_target all_host install_host \
+	install install-libs install-headers
+
+.SUFFIXES:
+.SUFFIXES: .c .cc .def .a .o .d .s
+
+all_host=@all_host@
+install_host=@install_host@
+
+all: all_target $(all_host)
+
+all_target: $(TARGET_LIBS)
+
+all_host: $(TEST_LIB_NAME)
+
+force:
+
+install: install-libs install-headers install-man install_target \
+	$(install_host) $(install_target)
+
+uninstall: uninstall-libs uninstall-headers uninstall-man
+
+install-libs: $(TARGET_LIBS)
+	@$(MKDIRP) $(bindir)
+	$(INSTALL_PROGRAM) $(TEST_DLL_NAME) $(bindir)/$(DLL_NAME); \
+	for i in $^; do \
+	    $(INSTALL_DATA) $$i $(tooldir)/lib/`basename $$i` ; \
+	done
+
+install-headers:
+	cd $(srcdir); \
+	for sub in `find include -name '[a-z]*' -type d -print | sort`; do \
+	    $(MKDIRP) $(tooldir)/$$sub; \
+	    for i in $$sub/*.h ; do \
+	      $(INSTALL_DATA) $$i $(tooldir)/$$sub/`basename $$i` ; \
+	    done ; \
+	done ; \
+	$(INSTALL_DATA) regex/regex.h $(tooldir)/include/regex.h
+
+install-man:
+	@$(MKDIRP) $(mandir)/man2 $(mandir)/man3 $(mandir)/man5 $(mandir)/man7
+	cd $(srcdir); \
+	for i in `find . -type f -name '*.2'`; do \
+	    $(INSTALL_DATA) $$i $(mandir)/man2/`basename $$i` ; \
+	done; \
+	for i in `find . -type f -name '*.3'`; do \
+	    $(INSTALL_DATA) $$i $(mandir)/man3/`basename $$i` ; \
+	done; \
+	for i in `find . -type f -name '*.5'`; do \
+	    $(INSTALL_DATA) $$i $(mandir)/man5/`basename $$i` ; \
+	done; \
+	for i in `find . -type f -name '*.7'`; do \
+	    $(INSTALL_DATA) $$i $(mandir)/man7/`basename $$i` ; \
+	done
+
+install_target:
+
+install_host:
+
+uninstall-libs: $(TARGET_LIBS)
+	rm -f $(bindir)/$(DLL_NAME); \
+	for i in $^; do \
+	    rm -f $(tooldir)/lib/$$i ; \
+	done
+
+uninstall-headers:
+	cd $(srcdir); \
+	for sub in `find include -name '[a-z]*' -type d -print | sort`; do \
+	    for i in $$sub/*.h ; do \
+	      rm -f $(tooldir)/$$sub/`basename $$i` ; \
+	    done ; \
+	done ; \
+	rm -f $(tooldir)/include/regex.h
+
+uninstall-man:
+	cd $(srcdir); \
+	for i in `find . -type f -name '*.2'`; do \
+	    rm -f $(tooldir)/man/man2/`basename $$i` ; \
+	done; \
+	for i in `find . -type f -name '*.3'`; do \
+	    rm -f $(tooldir)/man/man3/`basename $$i` ; \
+	done; \
+	for i in `find . -type f -name '*.5'`; do \
+	    rm -f $(tooldir)/man/man5/`basename $$i` ; \
+	done; \
+	for i in `find . -type f -name '*.7'`; do \
+	    rm -f $(tooldir)/man/man7/`basename $$i` ; \
+	done
+
+clean:
+	-rm -f *.o *.dll *.dbg *.a *.exp junk *.base version.cc regexp/*.o winver_stamp *.exe *.d *stamp* *_magic.h sigfe.s cygwin.def
+	-@$(MAKE) -C $(bupdir)/cygserver libclean
+
+maintainer-clean realclean: clean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	-rm -fr configure
+
+
+# Rule to build cygwin.dll
+$(TEST_DLL_NAME): $(LDSCRIPT) dllfixdbg $(DLL_OFILES) $(DLL_IMPORTS) $(LIBSERVER) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp
+	$(CXX) $(CXXFLAGS) -Wl,--gc-sections $(nostdlib) -Wl,-T$(firstword $^) \
+	-Wl,--heap=0 -Wl,--out-implib,cygdll.a -shared -o $@ \
+	-e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \
+	$(MALLOC_OBJ) $(LIBSERVER) $(LIBM) $(LIBC) \
+	-lgcc $(DLL_IMPORTS)
+	@$(word 2,$^) $(OBJDUMP) $(OBJCOPY) $@ ${patsubst %0.dll,%1.dbg,$@}
+	@ln -f $@ new-$(DLL_NAME)
+
+# Rule to build libcygwin.a
+$(LIB_NAME): rmsym newsym $(TEST_DLL_NAME) $(LIBCOS)
+	/bin/sh ${word 1,$^} ./cygdll.a "$(NM)" "$(AR)" $(OBSOLETE_FUNCTIONS) || exit 0
+	/bin/sh ${word 2,$^} ./cygdll.a "$(AS)" "$(AR)" $(NEW_FUNCTIONS) || exit 0
+	(echo create $(LIB_NAME); echo addmod $(LIBCOS); echo addlib cygdll.a; echo save) | $(AR) -M
+	$(RANLIB) $@
+
+# Rule to make stub library used by testsuite
+# dependency set to $(LIB_NAME) to accommodate make -j2.
+# Otherwise dlltool gets confused. cgf (11-16-2000)
+$(TEST_LIB_NAME): $(LIB_NAME)
+	perl -p -e 'BEGIN{binmode(STDIN); binmode(STDOUT);}; s/cygwin1/cygwin0/g' < $? > $@
+
+$(LIBSERVER): $(bupdir)/cygserver/Makefile
+	$(MAKE) -C $(bupdir)/cygserver libcygserver.a
+
+dll_ofiles: $(DLL_OFILES)
+
+$(LIBGMON_A): $(GMON_OFILES) $(GMON_START)
+	$(AR) rcv $(LIBGMON_A) $(GMON_OFILES)
+
+$(API_VER): $(srcdir)/cygwin.din
+	@echo Error: Version info is older than DLL API!
+
+version.cc winver.o: winver_stamp
+	@ :
+
+shared_info_magic.h: cygmagic shared_info.h
+	/bin/sh ${word 1,$^} $@ "$(CC) -x c" ${word 2,$^} USER_MAGIC 'class user_info' SHARED_MAGIC 'class shared_info'
+
+child_info_magic.h: cygmagic child_info.h
+	/bin/sh ${word 1,$^} $@ "$(CC) -x c" ${word 2,$^} CHILD_INFO_MAGIC 'class child_info'
+
+dcrt0.o sigproc.o: child_info_magic.h
+
+shared.o: shared_info_magic.h
+
+$(srcdir)/qevices.cc: cygwin-gperf devices.gperf devices.h
+	$^ > $@
+
+$(srcdir)/devices.cc: gendevices devices.in devices.h
+	${wordlist 1,2,$^} $@
+
+$(PWD)/libpthread.a: speclib $(LIB_NAME) pthread.o thread.o
+	/bin/sh ${word 1, $^} $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^}
+
+$(PWD)/libutil.a: speclib $(LIB_NAME) bsdlib.o
+	/bin/sh ${word 1, $^} $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^}
+
+$(PWD)/libm.a: speclib $(LIB_NAME) $(LIBM)
+	/bin/sh ${word 1, $^} $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^}
+
+$(PWD)/libc.a: speclib $(LIB_NAME) $(PWD)/libm.a libpthread.a libutil.a
+	/bin/sh ${word 1, $^} -v $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^}
+
+$(PWD)/libdl.a: speclib $(LIB_NAME) dlfcn.o
+	/bin/sh ${word 1, $^} $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^}
+
+lib%.a: %.o
+	$(AR) cru $@ $?
+
+winver_stamp: mkvers.sh include/cygwin/version.h winver.rc $(DLL_OFILES)
+	@echo "Making version.o and winver.o";\
+	$(SHELL) ${word 1,$^} ${word 2,$^} ${word 3,$^} $(WINDRES) && \
+	$(COMPILE_CXX) -o version.o version.cc && \
+	touch $@
+
+Makefile: cygwin.din
+
+$(DEF_FILE): gendef cygwin.din $(srcdir)/tlsoffsets.h
+	$^ $@ sigfe.s
+
+$(srcdir)/tlsoffsets.h: gentls_offsets cygtls.h
+	$^ $@ $(COMPILE_CXX)
+
+sigfe.s: $(DEF_FILE)
+	@[ -s $@ ] || \
+	{ rm -f $(DEF_FILE); $(MAKE) -s -j1 $(DEF_FILE); }; \
+	[ -s $@ ] && touch $@
+
+sigfe.o: sigfe.s
+	$(CC) -c -o $@ $?
+
+winsup.h: config.h
+
+deps:=${wildcard *.d}
+ifneq (,$(deps))
+include $(deps)
+endif
diff --git a/winsup/cygwin/include/cygwin/time.h b/winsup/cygwin/include/cygwin/time.h
index 61d385e67c2..95665c90071 100644
--- a/winsup/cygwin/include/cygwin/time.h
+++ b/winsup/cygwin/include/cygwin/time.h
@@ -30,13 +30,8 @@ time_t timegm (struct tm *);
 #   define daylight _daylight
 # endif
 
-/* The timezone function is only kept for backward compatibility.
-   POSIX expects the timezone variable as XSI extension. */
-# ifdef __timezonefunc__
-char __cdecl *timezone (void);
-# elif !defined(timezone)
-#   define timezone _timezone
-# endif
+extern long timezone __asm__ ("__timezone");
+
 #endif /*__STRICT_ANSI__*/
 
 #ifdef __cplusplus