[memcached] kronuz, r444: Fixed some issues after the Sync with 1....

commits at code.sixapart.com commits at code.sixapart.com
Thu Nov 23 19:23:46 UTC 2006


Fixed some issues after the Sync with 1.2.0

U   branches/server-win32/Win32-Code/config.h
U   branches/server-win32/Win32-Code/ntservice.c
U   branches/server-win32/Win32-Code/win32.h


Modified: branches/server-win32/Win32-Code/config.h
===================================================================
--- branches/server-win32/Win32-Code/config.h	2006-11-23 19:12:58 UTC (rev 443)
+++ branches/server-win32/Win32-Code/config.h	2006-11-23 19:23:44 UTC (rev 444)
@@ -24,3 +24,6 @@
 
 /* Version number of package */
 #define VERSION "1.2.0"
+
+/* Machine is littleendian */
+#define ENDIAN_LITTLE 1

Modified: branches/server-win32/Win32-Code/ntservice.c
===================================================================
--- branches/server-win32/Win32-Code/ntservice.c	2006-11-23 19:12:58 UTC (rev 443)
+++ branches/server-win32/Win32-Code/ntservice.c	2006-11-23 19:23:44 UTC (rev 444)
@@ -78,7 +78,7 @@
     SetServiceStatus(serviceStatusHandle, &serviceStatus);
 }
 
-void WINAPI ServiceMain(int argc, char* argv[])
+void WINAPI ServiceMain(DWORD dwNumServicesArgs, LPSTR *lpServiceArgVectors)
 {
     // initialise service status
     serviceStatus.dwServiceType = SERVICE_WIN32;

Modified: branches/server-win32/Win32-Code/win32.h
===================================================================
--- branches/server-win32/Win32-Code/win32.h	2006-11-23 19:12:58 UTC (rev 443)
+++ branches/server-win32/Win32-Code/win32.h	2006-11-23 19:23:44 UTC (rev 444)
@@ -13,15 +13,17 @@
 // for MSVC 6.0
 typedef          __int64    int64_t;
 typedef unsigned __int64    uint64_t;
-typedef          int        int32_t;
-typedef unsigned int        uint32_t;
 #else
 // default is GCC style
 typedef          long long  int64_t;
 typedef unsigned long long uint64_t;
+#endif // _WIN32 && _MSC_VER
 typedef          int        int32_t;
 typedef unsigned int        uint32_t;
-#endif // _WIN32 && _MSC_VER
+typedef          short      int16_t;
+typedef unsigned short      uint16_t;
+typedef          char       int8_t;
+typedef unsigned char       uint8_t;
 
 #define pid_t int
 #define close(s) closesocket(s)




More information about the memcached-commits mailing list