From: William A. Rowe Jr <wrowe@apache.org>
Date: Wed, 18 May 2011 03:07:48 +0000 (+0000)
Subject: Correct Win64 Servername Identification
X-Git-Tag: 2.2.19~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ca1d4ac0871d5f5f122f32db42b3ee6c0e8cf2d;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/STATUS b/STATUS
index 47f98862c73..4b130a6e60e 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 7d9d70cb57b..0fce478789a 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