Changeset 5 in libcf

Timestamp:

01/30/13 13:12:40 (11 years ago)

Author:

cheese

Message:

#1 add windows project and fix build compatibility

Location:

trunk

Files:

• include/cf_file.h (modified) (1 diff)
• include/cf_thread.h (modified) (3 diffs)
• src/cf_file.c (modified) (1 diff)
• src/cf_socket.c (modified) (3 diffs)
• src/cf_thread.c (modified) (2 diffs)
• windows (added)
• windows/libCF (added)
• windows/libCF.sln (added)
• windows/libCF/libCF.vcproj (added)

trunk/include/cf_file.h

@@ -7 +7 @@
 #include "cf_base.h"
 #include <fcntl.h>
-
-#ifdef _WIN32
-# define O_RDONLY       _O_RDONLY   | _O_BINARY
-# define O_WRONLY       _O_WRONLY   | _O_BINARY
-# define O_RDWR         _O_RDWR     | _O_BINARY
-# define O_APPEND       _O_APPEND   | _O_BINARY
-# define O_CREAT        _O_CREAT    | _O_BINARY
-# define O_TRUNC        _O_TRUNC
-#endif // #ifdef _WIN32
 
 #define CF_ERROR_FILE                   CF_ERROR_BASE * 2

trunk/include/cf_thread.h

@@ -9 +9 @@
 #ifdef _WIN32
 //# include <stddef.h>
-# define CF_THREAD_RETURN   uintptr_t
+# define CF_THREAD_RETURN   unsigned int
 # define CF_THREAD_CALL     __stdcall
 #else // #ifdef _WIN32
@@ -16 +16 @@
 #endif // #ifdef _WIN32
 
-#define CF_THREAD_FUNCTION  CF_THREAD_RETURN CF_THREAD_CALL
+typedef CF_THREAD_RETURN  (CF_THREAD_CALL * CF_Thread_Function) (void *);
 
 #define CF_ERROR_THREAD                 CF_ERROR_BASE * 4
@@ -35 +35 @@
 CF_EXPORT int
 CF_Thread_Create    (CF_Thread          * threadID,
-                     CF_THREAD_RETURN   callback,
+                     CF_Thread_Function callback,
                      void               * arg);
 

trunk/src/cf_file.c

@@ -6 +6 @@
 #ifdef _WIN32
 # include <io.h>
+# include <stdio.h>
 #else // #ifdef _WIN32
 # include <unistd.h>

trunk/src/cf_socket.c

@@ -7 +7 @@
 #ifdef _WIN32
 # include <WinSock2.h>
+# pragma comment (lib, "ws2_32.lib")
+# define close(__sock)  closesocket(__sock)
+# define sa_family_t    unsigned short
 #else
 # include <netinet/in.h>
@@ -74 +77 @@
     CHECK_INVALID_SOCKET (sock);
 
-    result = /* continued */
-#ifdef _WIN32
-        closesocket (socket);
-#else
-        close (sock);
-#endif
+    result = close (sock);
 
     if (result != 0)
@@ -143 +141 @@
     int result = 0;
 
-    CHECK_INVALID_SOCKET (sock);
-
-    if (timeout < 0)
-        return CF_ERROR_SOCKET_INVALID_ARGS;
-
-#ifndef _WIN32
+#ifdef _WIN32
+    int time_ms = timeout * 1000;
+#else
     struct timeval  timeval;
     timeval.tv_sec = timeout;
     timeval.tv_usec= 0;
-#else
-    int             time_ms = timeout * 1000;
-#endif
+#endif
+
+    CHECK_INVALID_SOCKET (sock);
+
+    if (timeout < 0)
+        return CF_ERROR_SOCKET_INVALID_ARGS;
 
     result = CF_Socket_SetOption (sock,

trunk/src/cf_thread.c

@@ -39 +39 @@
 
 int
-CF_Thread_Create (CF_Thread         * threadID,
-                  CF_THREAD_RETURN  callback,
-                  void              * arg)
+CF_Thread_Create (CF_Thread             * threadID,
+                  CF_Thread_Function    callback,
+                  void                  * arg)
 {
     int result = 0;
@@ -86 +86 @@
 
 #ifdef _WIN32
-    WaitForSingleObject ((THREAD_TYPE) *threaID, INFINITE);
+    WaitForSingleObject ((THREAD_TYPE) *threadID, INFINITE);
 #else
     int status;