[memcached] kronuz,
r400: Version number legends upgraded to 1.2.0...
commits at code.sixapart.com
commits at code.sixapart.com
Sun Sep 10 17:48:24 UTC 2006
Version number legends upgraded to 1.2.0-rc1
U branches/server-win32/Win32-Code/config.h
U branches/server-win32/Win32-Code/win32.h
U branches/server-win32/Win32-Prj/memcached.rc
Modified: branches/server-win32/Win32-Code/config.h
===================================================================
--- branches/server-win32/Win32-Code/config.h 2006-09-10 17:38:51 UTC (rev 399)
+++ branches/server-win32/Win32-Code/config.h 2006-09-10 17:48:22 UTC (rev 400)
@@ -8,19 +8,19 @@
#define PACKAGE_NAME "memcached Server"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "memcached 1.1.13"
+#define PACKAGE_STRING "memcached 1.2.0-rc1"
/* Define to the full name and version of this package. */
-#define PACKAGE_DESCRIPTION "memcached 1.1.13 is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load. Win32 port by Kronuz."
+#define PACKAGE_DESCRIPTION "memcached 1.2.0-rc1 is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load. Win32 port by Kronuz."
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "memcached"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.13"
+#define PACKAGE_VERSION "1.2.0-rc1"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.1.13"
+#define VERSION "1.2.0-rc1"
Modified: branches/server-win32/Win32-Code/win32.h
===================================================================
--- branches/server-win32/Win32-Code/win32.h 2006-09-10 17:38:51 UTC (rev 399)
+++ branches/server-win32/Win32-Code/win32.h 2006-09-10 17:48:22 UTC (rev 400)
@@ -1,51 +1,51 @@
-/* win32.h
- *
- */
-
-#ifndef WIN32_H
-#define WIN32_H
-
-#include <Winsock2.h>
-
-#pragma warning(disable : 4996)
-
-#if defined(_MSC_VER)
-// 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;
-typedef int int32_t;
-typedef unsigned int uint32_t;
-#endif // _WIN32 && _MSC_VER
-
-#define pid_t int
-#define close(s) closesocket(s)
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#define EAGAIN EWOULDBLOCK
-#define E2BIG WSAEMSGSIZE
-#define EAFNOSUPPORT WSAEOPNOTSUPP
-typedef int socklen_t;
-
-#undef errno
-#define errno WSAGetLastError()
-
-#define O_BLOCK 0
-#define O_NONBLOCK 1
-#define F_GETFL 3
-#define F_SETFL 4
-
+/* win32.h
+ *
+ */
+
+#ifndef WIN32_H
+#define WIN32_H
+
+#include <Winsock2.h>
+
+#pragma warning(disable : 4996)
+
+#if defined(_MSC_VER)
+// 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;
+typedef int int32_t;
+typedef unsigned int uint32_t;
+#endif // _WIN32 && _MSC_VER
+
+#define pid_t int
+#define close(s) closesocket(s)
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#define EAGAIN EWOULDBLOCK
+#define E2BIG WSAEMSGSIZE
+#define EAFNOSUPPORT WSAEOPNOTSUPP
+typedef int socklen_t;
+
+#undef errno
+#define errno WSAGetLastError()
+
+#define O_BLOCK 0
+#define O_NONBLOCK 1
+#define F_GETFL 3
+#define F_SETFL 4
+
#define IOV_MAX 1024
struct iovec
{
char *iov_base;
int iov_len;
-};
-
+};
+
struct msghdr
{
void *msg_name; /* Socket name */
@@ -55,11 +55,11 @@
void *msg_accrights; /* Per protocol magic (eg BSD file descriptor passing) */
int msg_accrightslen; /* Length of rights list */
};
-
-int fcntl(SOCKET s, int cmd, int val);
-int inet_aton(register const char *cp, struct in_addr *addr);
-
-__inline int inet_pton(int af, register const char *cp, struct in_addr *addr)
+
+int fcntl(SOCKET s, int cmd, int val);
+int inet_aton(register const char *cp, struct in_addr *addr);
+
+__inline int inet_pton(int af, register const char *cp, struct in_addr *addr)
{
if(af != AF_INET) {
WSASetLastError(EAFNOSUPPORT);
@@ -67,21 +67,21 @@
}
return inet_aton(cp, addr);
}
-
-__inline size_t write(int s, void *buf, size_t len)
-{
- size_t ret = send(s, buf, len, 0);
- if(ret == -1 && WSAGetLastError() == WSAECONNRESET) return 0;
- return ret;
-}
-
-__inline size_t read(int s, void *buf, size_t len)
-{
- size_t ret = recv(s, buf, len, 0);
- if(ret == -1 && WSAGetLastError() == WSAECONNRESET) return 0;
- return ret;
-}
-
+
+__inline size_t write(int s, void *buf, size_t len)
+{
+ size_t ret = send(s, buf, len, 0);
+ if(ret == -1 && WSAGetLastError() == WSAECONNRESET) return 0;
+ return ret;
+}
+
+__inline size_t read(int s, void *buf, size_t len)
+{
+ size_t ret = recv(s, buf, len, 0);
+ if(ret == -1 && WSAGetLastError() == WSAECONNRESET) return 0;
+ return ret;
+}
+
#define MAXPACKETSIZE (1500-28)
__inline int sendmsg(int s, const struct msghdr *msg, int flags)
{
@@ -101,8 +101,8 @@
cp += plen;
}
ret = send(s, (char*)wrkbuf, cp - wrkbuf, flags);
- if(ret == -1 && WSAGetLastError() == WSAECONNRESET) return 0;
- return ret;
-}
-
-#endif
+ if(ret == -1 && WSAGetLastError() == WSAECONNRESET) return 0;
+ return ret;
+}
+
+#endif
Modified: branches/server-win32/Win32-Prj/memcached.rc
===================================================================
--- branches/server-win32/Win32-Prj/memcached.rc 2006-09-10 17:38:51 UTC (rev 399)
+++ branches/server-win32/Win32-Prj/memcached.rc 2006-09-10 17:48:22 UTC (rev 400)
@@ -1,7 +1,7 @@
1 ICON DISCARDABLE "memcached.ico"
1 VERSIONINFO
- FILEVERSION 1,1,13,0
- PRODUCTVERSION 1,1,13,0
+ FILEVERSION 1,2,0,0
+ PRODUCTVERSION 1,2,0,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x01L
@@ -19,12 +19,12 @@
VALUE "Comments", "Use and distribution licensed under the BSD license (the ""License""); you may not use this file except in compliance with the License. \r\n\r\nUnless required by applicable law, software distributed under the License is provided ""AS IS"" AND ANY EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED. \r\n\r\nThis product includes software developed by Niels Provos.\r\n[ libevent ] Copyright 2000-2003 Niels Provos <provos at citi.umich.edu>\r\n\r\nThis product includes software developed by the NetBSD Foundation, Inc. and its contributors.\r\n[ bsd_getopts ] Copyright (c) 2000 The NetBSD Foundation, Inc.\r\n\r\nThis product includes software developed by Kronuz.\r\n[ ntservice ] Copyright (c) 2006 Germán Méndez Bravo (Kronuz) <kronuz at users.sf.net>\0"
VALUE "CompanyName", "Danga Interactive, Inc.\0"
VALUE "FileDescription", "memcached Server\0"
- VALUE "FileVersion", "1.1.13\0"
+ VALUE "FileVersion", "1.2.0\0"
VALUE "InternalName", "memcached.exe\0"
- VALUE "LegalCopyright", "Copyright (c) 2003, Danga Interactive, Inc. All rights reserved.\0"
+ VALUE "LegalCopyright", "Copyright (c) 2003-2006, Danga Interactive, Inc. All rights reserved.\0"
VALUE "OriginalFilename", "memcached.exe\0"
VALUE "ProductName", "memcached Server\0"
- VALUE "ProductVersion", "1.1.13\0"
+ VALUE "ProductVersion", "1.2.0\0"
END
END
BLOCK "VarFileInfo"
More information about the memcached-commits
mailing list