summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2011-05-18 03:07:48 +0000
committerWilliam A. Rowe Jr <wrowe@apache.org>2011-05-18 03:07:48 +0000
commit6ca1d4ac0871d5f5f122f32db42b3ee6c0e8cf2d (patch)
tree5de156def977d443f64c419bf4b1d8825be456a8
parent512ea7ce098500664c9034f2ad0b989f9be5485a (diff)
downloadhttpd-6ca1d4ac0871d5f5f122f32db42b3ee6c0e8cf2d.tar.gz
Correct Win64 Servername Identification
PR: 47418 Submitted by: [Jorge Schrauwen <jorge.schrauwen gmail.com>] Backports: r1104624 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1104673 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--STATUS5
-rw-r--r--os/win32/os.h4
2 files changed, 4 insertions, 5 deletions
diff --git a/STATUS b/STATUS
index 47f98862c7..4b130a6e60 100644
--- a/STATUS
+++ b/STATUS
@@ -104,11 +104,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
trawick: any reason it shouldn't be completely aligned with default_handler's
choice to return OK vs. 500?
- * Correct Win64 Servername Identification
- PR: 47418
- Submitted by: [Jorge Schrauwen <jorge.schrauwen gmail.com>]
- http://svn.apache.org/viewvc?view=revision&revision=1104624
- +1: wrowe, trawick, fuankg
PATCHES/ISSUES THAT ARE STALLED
diff --git a/os/win32/os.h b/os/win32/os.h
index 7d9d70cb57..0fce478789 100644
--- a/os/win32/os.h
+++ b/os/win32/os.h
@@ -38,7 +38,11 @@
#include <io.h>
#include <fcntl.h>
+#ifdef _WIN64
+#define PLATFORM "Win64"
+#else
#define PLATFORM "Win32"
+#endif
/* going away shortly... */
#define HAVE_DRIVE_LETTERS