From 9187dd7a897a97e2d4e105ef3a0a9edf62e54e70 Mon Sep 17 00:00:00 2001 From: Bill Stoddard Date: Sun, 22 Feb 2004 03:27:49 +0000 Subject: [PATCH] Win32: Fix compile breakage git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102745 13f79535-47bb-0310-9956-ffa450edef68 --- build/win32/win32ver.awk | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/build/win32/win32ver.awk b/build/win32/win32ver.awk index ce64693c60..0930c4936e 100644 --- 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) { -- 2.50.1