diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-16 14:14:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-17 11:33:57 +0000 |
| commit | 2087484c65a3d5e75a9e8ad116d11a4e13366219 (patch) | |
| tree | 1f335918a854319df9269329d165a91d711d2108 /odk | |
| parent | d6bf086012343b4a1e27cd4242dced9ee0d73a06 (diff) | |
use consistent #define checks for the Windows platform
stage 2 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro
In this stage we focus on replacing usage of the WIN macro
Change-Id: Ie8a4a63198a6de96bd158ecd707dadafb9c8ea84
Reviewed-on: https://gerrit.libreoffice.org/22393
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_allheaders.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/odk/CustomTarget_allheaders.mk b/odk/CustomTarget_allheaders.mk index 5f22d8544e30..d48abe0cd983 100644 --- a/odk/CustomTarget_allheaders.mk +++ b/odk/CustomTarget_allheaders.mk @@ -16,14 +16,14 @@ $(call gb_CustomTarget_get_target,odk/allheaders) : \ define odk_genincludesheader // Generated list of sal includes -#ifdef WNT +#ifdef _WIN32 #include <windows.h> #endif endef define odk_geninclude -$(if $(2),#ifdef WNT) +$(if $(2),#ifdef _WIN32) #include <$(subst $(INSTDIR)/$(SDKDIRNAME)/include/,,$(1))> $(if $(2),#endif) @@ -35,11 +35,11 @@ $(odk_allheaders_DIR)/allheaders.hxx : \ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ifeq ($(HAVE_GNUMAKE_FILE_FUNC),) printf '// Generated list of sal includes\n' > $@ && \ - printf '#ifdef WNT\n' >> $@ && \ + printf '#ifdef _WIN32\n' >> $@ && \ printf '#include <windows.h>\n' >> $@ && \ printf '#endif\n' >> $@ \ $(foreach file,$(shell cat $^),\ - $(if $(findstring /win32/,$(file)),&& printf '#ifdef WNT\n' >> $@) \ + $(if $(findstring /win32/,$(file)),&& printf '#ifdef _WIN32\n' >> $@) \ && printf '#include <%s>\n' $(subst $(INSTDIR)/$(SDKDIRNAME)/include/,,$(file)) >> $@ \ $(if $(findstring /win32/,$(file)),&& printf '#endif // WNT\n' >> $@) \ ) |