From 3479ab1925e92f8afc096838676341dd37f675cd Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sun, 28 Mar 2010 21:01:25 +0000
Subject: [PATCH] [FTP/DHCP] - remove the oldnames hack, as we now have a
 proper oldnames lib (included in mingw_common) - protect struct timezone from
 redefinition

svn path=/branches/ros-amd64-bringup/; revision=46526
---
 reactos/base/applications/network/ftp/fake.h     |  9 ++++++---
 reactos/base/applications/network/ftp/ftp.rbuild | 11 -----------
 reactos/base/services/dhcp/dhcp.rbuild           |  7 -------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/reactos/base/applications/network/ftp/fake.h b/reactos/base/applications/network/ftp/fake.h
index f622c401970..a22009886bd 100644
--- a/reactos/base/applications/network/ftp/fake.h
+++ b/reactos/base/applications/network/ftp/fake.h
@@ -9,9 +9,12 @@
 #define strcasecmp _stricmp
 #define strncasecmp _strnicmp
 
+#ifndef _TIMEZONE_DEFINED /* also in sys/time.h */
+#define _TIMEZONE_DEFINED
 struct timezone {
-    int tz_minuteswest; /* minutes W of Greenwich */
-    int tz_dsttime;     /* type of dst correction */
+  int tz_minuteswest;
+  int tz_dsttime;
 };
 
-int gettimeofday(struct timeval *tv, struct timezone *tz);
+  extern int __cdecl gettimeofday (struct timeval *p, struct timezone *z);
+#endif
diff --git a/reactos/base/applications/network/ftp/ftp.rbuild b/reactos/base/applications/network/ftp/ftp.rbuild
index 193fa6e8ebd..d7794dc986a 100644
--- a/reactos/base/applications/network/ftp/ftp.rbuild
+++ b/reactos/base/applications/network/ftp/ftp.rbuild
@@ -4,17 +4,6 @@
 	<include base="ftp">.</include>
 	<define name="lint" />
 
-	<!-- FIXME: workarounds until we have a proper oldnames library -->
-	<define name="chdir">_chdir</define>
-	<define name="getcwd">_getcwd</define>
-	<define name="mktemp">_mktemp</define>
-	<define name="unlink">_unlink</define>
-	<define name="close">_close</define>
-	<define name="fileno">_fileno</define>
-	<define name="read">_read</define>
-	<define name="write">_write</define>
-	<define name="lseek">_lseek</define>
-
 	<library>ws2_32</library>
 	<library>iphlpapi</library>
 	<file>cmds.c</file>
diff --git a/reactos/base/services/dhcp/dhcp.rbuild b/reactos/base/services/dhcp/dhcp.rbuild
index 85e5147d834..93a31dcd613 100644
--- a/reactos/base/services/dhcp/dhcp.rbuild
+++ b/reactos/base/services/dhcp/dhcp.rbuild
@@ -4,13 +4,6 @@
 	<include base="dhcp">.</include>
 	<include base="dhcp">include</include>
 
-	<!-- FIXME: workarounds until we have a proper oldnames library -->
-	<define name="tzset">_tzset</define>
-	<define name="close">_close</define>
-	<define name="read">_read</define>
-	<define name="write">_write</define>
-	<define name="NO_OLDNAMES">1</define>
-
 	<library>ntdll</library>
 	<library>ws2_32</library>
 	<library>iphlpapi</library>