[tkreuzer] 38237: remove struct timezone from time.h, always declare __tzset(), revert changes from 38052 to ftp.

Author: tkreuzer
Date: Sun Dec 21 11:26:39 2008
New Revision: 38237

URL: http://svn.reactos.org/svn/reactos?rev=38237&view=rev
Log:
remove struct timezone from time.h, always declare __tzset(), revert changes from 38052 to ftp.

Modified:
    trunk/reactos/base/applications/network/ftp/fake.c
    trunk/reactos/base/applications/network/ftp/fake.h
    trunk/reactos/base/applications/network/ftp/ftp_var.h
    trunk/reactos/include/crt/time.h

Modified: trunk/reactos/base/applications/network/ftp/fake.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/f...
==============================================================================
--- trunk/reactos/base/applications/network/ftp/fake.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/ftp/fake.c [iso-8859-1] Sun Dec 21 11:26:39 2008
@@ -1,6 +1,5 @@
 #include <stdio.h>
-//#include <time.h>
-#include <sys/time.h>
+#include <time.h>
 #include <winsock.h>
 #include "fake.h"
 #include "prototypes.h"
@@ -308,13 +307,12 @@
 #define EPOCHFILETIME (116444736000000000LL)
 #endif

-int gettimeofday(struct timeval *tv, void *tz0)
+int gettimeofday(struct timeval *tv, struct timezone *tz)
 {
     FILETIME        ft;
     LARGE_INTEGER   li;
     __int64         t;
     static int      tzflag;
-    struct timezone *tz = tz0;

if (tv)
     {

Modified: trunk/reactos/base/applications/network/ftp/fake.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/f...
==============================================================================
--- trunk/reactos/base/applications/network/ftp/fake.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/ftp/fake.h [iso-8859-1] Sun Dec 21 11:26:39 2008
@@ -9,4 +9,9 @@
 #define strcasecmp strcmp
 #define strncasecmp strnicmp

-void __cdecl _tzset(void);
+struct timezone {
+    int tz_minuteswest; /* minutes W of Greenwich */
+    int tz_dsttime;     /* type of dst correction */
+};
+
+int gettimeofday(struct timeval *tv, struct timezone *tz);

Modified: trunk/reactos/base/applications/network/ftp/ftp_var.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/f...
==============================================================================
--- trunk/reactos/base/applications/network/ftp/ftp_var.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/ftp/ftp_var.h [iso-8859-1] Sun Dec 21 11:26:39 2008
@@ -2,7 +2,7 @@
 #include "fake.h"
 #include "prototypes.h"
 #include <setjmp.h>
-#include <sys/time.h>
+#include <time.h>

//typedef void (*Sig_t)(int);

Modified: trunk/reactos/include/crt/time.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/time.h?rev=3823...
==============================================================================
--- trunk/reactos/include/crt/time.h [iso-8859-1] (original)
+++ trunk/reactos/include/crt/time.h [iso-8859-1] Sun Dec 21 11:26:39 2008
@@ -145,9 +145,8 @@
   _CRTIMP __time32_t __cdecl _mkgmtime32(struct tm *_Tm);
 #if defined (_POSIX_) || defined(__GNUC__)
   void __cdecl tzset(void);
-#else
+#endif
   _CRTIMP void __cdecl _tzset(void);
-#endif

#if _INTEGRAL_MAX_BITS >= 64
   double __cdecl _difftime64(__time64_t _Time1,__time64_t _Time2);
@@ -236,18 +235,6 @@
 #define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0
 #endif /* _TIMEVAL_DEFINED */

-#ifndef __STRICT_ANSI__
-#ifndef _TIMEZONE_DEFINED /* also in sys/time.h */
-#define _TIMEZONE_DEFINED
-struct timezone {
-  int tz_minuteswest;
-  int tz_dsttime;
-};
-
-  extern int __cdecl mingw_gettimeofday (struct timeval *p, struct timezone *z);
-#endif
-#endif /* __STRICT_ANSI__ */
-
 #ifdef __cplusplus
 }
 #endif