Revision: 14545
Author: adrian.chadd
Date: Mon Apr 5 20:06:53 2010
Log: Issue #94 - migrate some of the win32 specific stuff out of src/ and
into include/
so other bits of code can use it.
http://code.google.com/p/lusca-cache/source/detail?r=14545
Added:
/branches/LUSCA_HEAD/include/win32_compat.h
Modified:
/branches/LUSCA_HEAD/lib/win32lib.c
/branches/LUSCA_HEAD/src/enums.h
/branches/LUSCA_HEAD/src/squid.h
=======================================
--- /dev/null
+++ /branches/LUSCA_HEAD/include/win32_compat.h Mon Apr 5 20:06:53 2010
@@ -0,0 +1,21 @@
+#ifndef __WIN32_COMPAT_H__
+#define __WIN32_COMPAT_H__
+
+/*
+ * Supported Windows OS types codes
+ */
+enum {
+ _WIN_OS_UNKNOWN,
+ _WIN_OS_WIN32S,
+ _WIN_OS_WIN95,
+ _WIN_OS_WIN98,
+ _WIN_OS_WINME,
+ _WIN_OS_WINNT,
+ _WIN_OS_WIN2K,
+ _WIN_OS_WINXP,
+ _WIN_OS_WINNET,
+ _WIN_OS_WINLON,
+ _WIN_OS_WIN7
+};
+
+#endif
=======================================
--- /branches/LUSCA_HEAD/lib/win32lib.c Mon Apr 5 05:15:45 2010
+++ /branches/LUSCA_HEAD/lib/win32lib.c Mon Apr 5 20:06:53 2010
@@ -54,6 +54,8 @@
#include <psapi.h>
#endif
+#include "win32_compat.h"
+
THREADLOCAL int ws32_result;
THREADLOCAL int _so_err;
THREADLOCAL int _so_err_siz = sizeof(int);
=======================================
--- /branches/LUSCA_HEAD/src/enums.h Thu Apr 1 23:26:01 2010
+++ /branches/LUSCA_HEAD/src/enums.h Mon Apr 5 20:06:53 2010
@@ -387,27 +387,6 @@
VARY_CANCEL
};
-/* Windows Port */
-#ifdef _SQUID_WIN32_
-/*
- * Supported Windows OS types codes
- */
-enum {
- _WIN_OS_UNKNOWN,
- _WIN_OS_WIN32S,
- _WIN_OS_WIN95,
- _WIN_OS_WIN98,
- _WIN_OS_WINME,
- _WIN_OS_WINNT,
- _WIN_OS_WIN2K,
- _WIN_OS_WINXP,
- _WIN_OS_WINNET,
- _WIN_OS_WINLON,
- _WIN_OS_WIN7
-};
-
-#endif
-
typedef enum {
ST_OP_NONE,
ST_OP_OPEN,
=======================================
--- /branches/LUSCA_HEAD/src/squid.h Thu Apr 1 23:26:01 2010
+++ /branches/LUSCA_HEAD/src/squid.h Mon Apr 5 20:06:53 2010
@@ -351,6 +351,11 @@
#include "hash.h"
#include "rfc1035.h"
+/* Windows Port */
+#ifdef _SQUID_WIN32_
+#include "../include/win32_compat.h"
+#endif
+
#include "../libcore/dlink.h"
#include "../libcore/fifo.h"
#include "../libcore/tools.h"
--
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en.
