Changeset 29922 for lang/c

Timestamp:

02/11/09 21:52:23 (4 years ago)

Author:

saturday06

Message:

mo

Location:

lang/c/AutoUpdater

Files:

• AutoUpdater.c (modified) (1 diff)
• AutoUpdater.h (modified) (1 diff)

lang/c/AutoUpdater/AutoUpdater.c

@@ -9 +9 @@
 #include <time.h>
 
-#ifndef AU_WINDOWS
-  #define TCHAR char
-  #define _tcsdup strdup
-  #define _T(text) text
+#if !defined(AU_WINDOWS)
+
+  #ifndef _TCHAR_DEFINED
+    typedef TCHAR char;
+    #define _tcsdup strdup
+  #endif
+
+  #ifndef _T
+    #define _T(x) x
+  #endif
+
+#elif defined(__CYGWIN__)
+
+  #ifndef _TCHAR_DEFINED
+    #if defined(UNICODE) || defined(_UNICODE)
+    typedef TCHAR WCHAR;
+    #else
+    typedef TCHAR CHAR;
+    #endif
+  #endif
+
+  #if defined(UNICODE) || defined(_UNICODE)
+    #include <wchar.h>
+    static wchar_t *wcsdup(const wchar_t *s) {
+        size_t len;
+        len = wcslen(s) + 1;
+        wchar_t* buf = malloc(len * sizeof(wchar_t));
+        memcpy(buf, s, len * sizeof(wchar_t));
+        return buf;
+    }
+    #define _tcsdup wcsdup
+  #else
+    #define _tcsdup strdup
+  #endif
+
+  #ifndef _T
+    #define _T(text) TEXT(text)
+  #endif
 #else
-  #ifdef __CYGWIN__
-    #define _T(text) TEXT(text)
-    #if defined(UNICODE) || defined(_UNICODE)
-      #include <wchar.h>
-      static wchar_t *wcsdup(const wchar_t *s) {
-          size_t len;
-          len = wcslen(s) + 1;
-          wchar_t* buf = malloc(len * sizeof(wchar_t));
-          memcpy(buf, s, len * sizeof(wchar_t));
-          return buf;
-      }
-      #define _tcsdup wcsdup
-    #else
-      #define _tcsdup strdup
-    #endif
-  #else
-    #include <tchar.h>
-    #ifdef _MSC_VER
-      #pragma comment(lib, "wininet.lib")
-    #endif
-    static unsigned int sleep(unsigned int seconds) {
-        Sleep(1000 * seconds);
-        return 0;
-    }
+
+  #include <tchar.h>
+  #ifdef _MSC_VER
+    #pragma comment(lib, "wininet.lib")
   #endif
+  static unsigned int sleep(unsigned int seconds) {
+      Sleep(1000 * seconds);
+      return 0;
+  }
+
 #endif
 

lang/c/AutoUpdater/AutoUpdater.h

@@ -59 +59 @@
 typedef struct {
     char created_sign;
-    const AU_Option option;
+    AU_Option option;
 
     AU_CHAR_* description;