I don't see VCL or NT351 being checked in any ifdef

So drop the GVER thing and -DVCL and -DNT351.

6 files changed, 4 insertions, 7 deletions

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e85ed83543c5..521a9c929071 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -182,7 +182,6 @@ gb_GLOBALDEFS := \
 	-D_REENTRANT \
 	-DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
 	-DSUPD=$(UPD) \
-	-DVCL \
 	$(gb_OSDEFS) \
 	$(gb_COMPILERDEFS) \
 	$(gb_CPUDEFS) \
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 92b4dbbdcb35..40027a102149 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -39,7 +39,6 @@ gb_RC := $(WINDRES)
 gb_OSDEFS := \
 	-DWINVER=0x0500 \
 	-D_WIN32_IE=0x0500 \
-	-DNT351 \
 	-DWIN32 \
 	-DWNT \
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 5f8fb1ca50a0..45c960905f58 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -52,7 +52,6 @@ endif
 gb_OSDEFS := \
 	-DWINVER=0x0500 \
 	-D_WIN32_IE=0x0500 \
-	-DNT351 \
 	-DWIN32 \
 	-DWNT \
 
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index c29e8ba8f9df..b886aa95a372 100644
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -46,7 +46,7 @@ USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR
 # Stack buffer overrun detection.
 CFLAGS+=-GS
 
-USE_CDEFS_X64+= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -DX86_64 -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
+USE_CDEFS_X64+= -D$(OS) -D$(GUI) -D$(COM) -DX86_64 -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
 .IF "$(debug)"!=""
 USE_CFLAGS_X64+=-Zi -Fd$(MISC_X64)/$(@:b).pdb
 USE_CDEFS_X64+=-DDEBUG
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 592290d7f359..3b9b260dbcc0 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -807,7 +807,7 @@ CDEFS=-D$(OS)
 .IF "$(GUI)" != "$(OS)"
 CDEFS+=-D$(GUI)
 .ENDIF
-CDEFS+=-D$(GVER) -D$(COM) -D$(CPUNAME)
+CDEFS+=-D$(COM) -D$(CPUNAME)
 
 .IF "$(USE_DEBUG_RUNTIME)" != ""
 CDEFS+=-D_DEBUG_RUNTIME
@@ -897,7 +897,7 @@ RSCUPDVER=$(RSCREVISION)
 RSCUPDVERDEF=-DUPDVER="$(RSCUPDVER)"
 
 RSCFLAGS=-s
-RSCDEFS=-D$(GUI) -D$(GVER) -D$(COM) $(JAVADEF)
+RSCDEFS=-D$(GUI) -D$(COM) $(JAVADEF)
 
 RSCDEFIMG*=default_images
 
diff --git a/solenv/inc/startup/startup.mk b/solenv/inc/startup/startup.mk
index e3e415e23181..0fa378c6b917 100644
--- a/solenv/inc/startup/startup.mk
+++ b/solenv/inc/startup/startup.mk
@@ -33,7 +33,7 @@ CALLTARGETS=$(MAKETARGETS)
 .INCLUDEDIRS : $(DMAKE_INC) $(SOLARVERSION)$/$(INPATH)$/inc $(SOLARENV)$/inc
 
 # Grab key definitions from the environment
-# .IMPORT .IGNORE : OS TMPDIR UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME GVER COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT VCL ENVCFLAGS
+# .IMPORT .IGNORE : OS TMPDIR UPD INPATH OUTPATH GUI COM EX CLASSPATH PRODUCT GUIBASE SOLARENV SOLARVER GUIENV CPU CPUNAME COMPATH LIB INCLUDE TR SORT UNIQ ROOTDIR SED AWK TOUCH IENV ILIB PRODUCT_ENV COMEX UPD BUILD DEVROOT ENVCFLAGS
 
 .IF "$(OS)" == "" || "$(OS)" == "Windows_NT"
 .ERROR : ; @echo Forced error: Environment variable OS has to be set for OOo build!