summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authormturk <mturk@13f79535-47bb-0310-9956-ffa450edef68>2005-01-17 12:26:58 +0000
committermturk <mturk@13f79535-47bb-0310-9956-ffa450edef68>2005-01-17 12:26:58 +0000
commitf2ea6479f9f52f775a956f281f13e8287bef7d38 (patch)
treefd5422d1a9774b1bdfce8df66b68cd02c62ec404 /misc
parent453b622567a336c0cd349f7cd044221598fbdf4c (diff)
downloadlibapr-f2ea6479f9f52f775a956f281f13e8287bef7d38.tar.gz
Added detection for XP_SP1, XP_SP2 and 2003.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@125411 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'misc')
-rw-r--r--misc/win32/misc.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/misc/win32/misc.c b/misc/win32/misc.c
index f86746214..743580944 100644
--- a/misc/win32/misc.c
+++ b/misc/win32/misc.c
@@ -79,8 +79,16 @@ apr_status_t apr_get_oslevel(apr_oslevel_e *level)
else
apr_os_level = APR_WIN_2000_SP2;
}
+ else if (oslev.dwMinorVersion == 2) {
+ apr_os_level = APR_WIN_2003;
+ }
else {
- apr_os_level = APR_WIN_XP;
+ if (servpack < 1)
+ apr_os_level = APR_WIN_XP;
+ else if (servpack == 1)
+ apr_os_level = APR_WIN_XP_SP1;
+ else
+ apr_os_level = APR_WIN_XP_SP2;
}
}
else {