[ros-diffs] [tkreuzer] 46526: [FTP/DHCP] - remove the oldnames hack, as we now have a proper oldnames lib (included in mingw_common) - protect struct timezone from redefinition

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Sun Mar 28 23:01:25 2010
New Revision: 46526

URL: http://svn.reactos.org/svn/reactos?rev=46526&view=rev
Log:
[FTP/DHCP]
- remove the oldnames hack, as we now have a proper oldnames lib (included in mingw_common)
- protect struct timezone from redefinition

Modified:
    branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.h
    branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.rbuild
    branches/ros-amd64-bringup/reactos/base/services/dhcp/dhcp.rbuild

Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.h?rev=46526&r1=46525&r2=46526&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.h [iso-8859-1] Sun Mar 28 23:01:25 2010
@@ -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

Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.rbuild?rev=46526&r1=46525&r2=46526&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] Sun Mar 28 23:01:25 2010
@@ -3,17 +3,6 @@
 <module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe">
 	<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>

Modified: branches/ros-amd64-bringup/reactos/base/services/dhcp/dhcp.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/services/dhcp/dhcp.rbuild?rev=46526&r1=46525&r2=46526&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/services/dhcp/dhcp.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/services/dhcp/dhcp.rbuild [iso-8859-1] Sun Mar 28 23:01:25 2010
@@ -3,13 +3,6 @@
 <module name="dhcp" type="win32cui" installbase="system32" installname="dhcp.exe">
 	<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>