From: Norbert Bizet Date: Wed, 3 Mar 2021 13:01:41 +0000 (-0500) Subject: Fix windows compilation issue X-Git-Tag: Release-11.0.2~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26e1653098987cd9437940591535d0c99c97dbff;p=thirdparty%2Fbacula.git Fix windows compilation issue --- diff --git a/bacula/src/win32/libwin32/main.cpp b/bacula/src/win32/libwin32/main.cpp index b2a726213..f7266ff25 100644 --- a/bacula/src/win32/libwin32/main.cpp +++ b/bacula/src/win32/libwin32/main.cpp @@ -442,10 +442,6 @@ void pause_msg(const char *file, const char *func, int line, const char *msg) #define PRODUCT_CLUSTER_SERVER_V 0x00000040 #define PRODUCT_ENTERPRISE_EVALUATION 0x00000048 #define PRODUCT_ENTERPRISE_N_EVALUATION 0x00000054 -#define PRODUCT_ENTERPRISE_S 0x0000007D -#define PRODUCT_ENTERPRISE_S_EVALUATION 0x00000081 -#define PRODUCT_ENTERPRISE_S_N 0x0000007E -#define PRODUCT_ENTERPRISE_S_N_EVALUATION 0x00000082 #define PRODUCT_HOME_PREMIUM_SERVER 0x00000022 #define PRODUCT_HOME_SERVER 0x00000013 #define PRODUCT_STORAGE_ENTERPRISE_SERVER_CORE 0x0000002E @@ -467,8 +463,6 @@ void pause_msg(const char *file, const char *func, int line, const char *msg) #define PRODUCT_ESSENTIALBUSINESS_SERVER_ADDLSVC 0x0000003E #define PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT 0x0000003B #define PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC 0x0000003D -#define PRODUCT_IOTUAP 0x0000007B -#define PRODUCT_IOTUAPCOMMERCIAL 0x00000083 #define PRODUCT_MOBILE_CORE 0x00000068 #define PRODUCT_MOBILE_ENTERPRISE 0x00000085 #define PRODUCT_MULTIPOINT_PREMIUM_SERVER 0x0000004D @@ -484,11 +478,19 @@ void pause_msg(const char *file, const char *func, int line, const char *msg) #define PRODUCT_STANDARD_EVALUATION_SERVER 0x0000004F #define PRODUCT_STANDARD_SERVER_SOLUTIONS 0x00000034 #define PRODUCT_STANDARD_SERVER_SOLUTIONS_CORE 0x00000035 +#endif +/* Windows 10 */ +#ifndef PRODUCT_ENTERPRISE_S +#define PRODUCT_ENTERPRISE_S 0x0000007D +#define PRODUCT_ENTERPRISE_S_EVALUATION 0x00000081 +#define PRODUCT_ENTERPRISE_S_N 0x0000007E +#define PRODUCT_ENTERPRISE_S_N_EVALUATION 0x00000082 +#define PRODUCT_IOTUAP 0x0000007B +#define PRODUCT_IOTUAPCOMMERCIAL 0x00000083 #endif #define PRODUCT_DATACENTER_A_SERVER_CORE 0x00000091 -#define PRODUCT_IOTUAPCOMMERCIAL 0x00000083 #define PRODUCT_PRO_WORKSTATION 0x000000A1 #define PRODUCT_PRO_WORKSTATION_N 0x000000A2 #define PRODUCT_STANDARD_A_SERVER_CORE 0x00000092