Win32: Fix compile breakage

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102745 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/win32/win32ver.awk b/build/win32/win32ver.awk
index ce64693c60b5a133a5e17547c2f3fd2043b79ac1..0930c4936eaae2e31cf0f0b1477eff8f3df8c214 100644 (file)
--- a/build/win32/win32ver.awk
+++ b/build/win32/win32ver.awk
@@ -49,18 +49,21 @@ BEGIN {
   }
 
   while ((getline < rel_h) > 0) {
-    if (match ($0, /^#define AP_SERVER_MAJORVERSION "[^"]+"/)) {
-      ver_major = substr($3, 2, length($3) - 2);
+    if (match ($0, /^#define AP_SERVER_MAJORVERSION_NUMBER [^*]/)) {
+      ver_major = $3;
     }
-    else if (match ($0, /^#define AP_SERVER_MINORVERSION "[^"]+"/)) {
-      ver_minor = substr($3, 2, length($3) - 2);
+    else if (match ($0, /^#define AP_SERVER_MINORVERSION_NUMBER [^*]/)) {
+      ver_minor = $3;
     }
-    else if (match ($0, /^#define AP_SERVER_PATCHLEVEL "[^"]+"/)) {
-      ver_patch = substr($3, 2, length($3) - 2);       
+    else if (match ($0, /^#define AP_SERVER_PATCHLEVEL_NUMBER [^*]/)) {
+      ver_patch = $3;
+    }
+    else if (match ($0, /^#define AP_SERVER_ADD_STRING [^"]+"/)) {
+      ver_patch_modifier = substr($3, 2, length($3) - 2);
     }
   }
 
-  ver = ver_major "." ver_minor "." ver_patch;
+  ver = ver_major "." ver_minor "." ver_patch ver_patch_modifier;
   verc = ver_major "," ver_minor "," ver_patch;   
   gsub(/\./, ",", verc);
   if (build) {