RepositoryExternal.mk | 20 -------------------- connectivity/source/parse/sqlflex.l | 1 + desktop/Executable_oosplash.mk | 6 ++++++ extensions/source/nsplugin/source/so_env.hxx | 3 +-- extensions/source/nsplugin/source/so_instance.cxx | 1 - extensions/source/nsplugin/source/so_main.cxx | 1 - idlc/Executable_idlc.mk | 1 - idlc/source/scanner.l | 1 + l10ntools/inc/export.hxx | 3 ++- l10ntools/source/cfglex.l | 1 + l10ntools/source/srclex.l | 1 + l10ntools/source/xrmlex.l | 1 + liblangtag/UnpackedTarball_langtag.mk | 1 + liblangtag/liblangtag-0.5.1-unistd.patch | 12 ++++++++++++ nss/ExternalProject_nss.mk | 4 ---- nss/nss-3.13.5-zlib-werror.patch | 4 +++- redland/Library_raptor.mk | 1 + sal/qa/osl/process/osl_process.cxx | 3 ++- sd/source/ui/inc/RemoteServer.hxx | 2 ++ sd/source/ui/remotecontrol/Communicator.hxx | 2 ++ sd/source/ui/remotecontrol/DiscoveryService.hxx | 2 ++ solenv/gbuild/platform/IOS_ARM_GCC.mk | 2 +- solenv/gbuild/platform/WNT_INTEL_GCC.mk | 4 ++-- solenv/gbuild/platform/android.mk | 2 +- solenv/gbuild/platform/macosx.mk | 2 +- solenv/gbuild/platform/solaris.mk | 2 +- solenv/gbuild/platform/unxgcc.mk | 3 ++- soltools/Executable_cpp.mk | 4 ---- soltools/Executable_makedepend.mk | 4 ---- soltools/Module_soltools.mk | 6 ------ soltools/Package_inc.mk | 11 ----------- soltools/mkdepend/def.h | 2 ++ soltools/winunistd/unistd.h | 6 ------ stoc/source/implementationregistration/implreg.cxx | 3 ++- svx/source/gengal/gengal.cxx | 2 ++ 35 files changed, 53 insertions(+), 71 deletions(-)
New commits: commit c007292ec3eedcf2b1ad673308fa42aad31a7333 Author: Michael Stahl <mst...@redhat.com> Date: Wed May 8 19:56:48 2013 +0200 gbuild: gcc platforms: link with C compiler if no C++ files In 5589c72b88e502bfca045ae38af16c854afdd401 a problem due to linking pyuno_wrapper with g++ was fixed: the library should not have a dependency on libstdc++. It's possible to implement this in gbuild directly by checking whether there are any C++ input files. (apparently on GNU/Linux g++ implicitly links in libm too...) Change-Id: I04dce06f796e20047ce7f5eab65e6110c0244445 diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index 51657fe..1e75f64 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -55,6 +55,12 @@ $(eval $(call gb_Executable_use_externals,oosplash,\ endif +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_libs,oosplash,\ + -lm \ +)) +endif + ifeq ($(OS),SOLARIS) $(eval $(call gb_Executable_add_libs,oosplash,\ diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 5bcb038..e525639 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -112,7 +112,7 @@ endef define gb_LinkTarget__command_dynamiclink $(if $(filter Library CppunitTest,$(TARGETTYPE)),@echo No dynamic libraries should be built for iOS && exit 1, \ mkdir -p $(dir $(1)) && \ - $(gb_CXX) \ + $(if $(CXXOBJECTS)$(OBJCXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \ $(gb_Executable_TARGETTYPEFLAGS) \ $(subst \d,$$,$(RPATH)) \ $(T_LDFLAGS) \ diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index b7760df..77fe838 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -126,7 +126,7 @@ gb_LinkTarget_INCLUDE +=\ define gb_LinkTarget__command_dynamiclinkexecutable $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ - $(gb_CXX) $(strip \ + $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) $(strip \ $(gb_Executable_TARGETTYPEFLAGS) \ $(if $(filter YES,$(TARGETGUI)), -mwindows, -mconsole) \ $(T_LDFLAGS) \ @@ -147,7 +147,7 @@ endef define gb_LinkTarget__command_dynamiclinklibrary $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ - $(gb_CXX) $(strip \ + $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) $(strip \ $(gb_Library_TARGETTYPEFLAGS) \ $(T_LDFLAGS) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index aec9858..0161f97 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -36,7 +36,7 @@ gb_LinkTarget_LDFLAGS += \ define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ - $(gb_CXX) \ + $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \ -shared \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 5d6bd8b..1f123f1 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -138,7 +138,7 @@ endef define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ - $(gb_CXX) \ + $(if $(CXXOBJECTS)$(OBJCXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ $(if $(filter Bundle,$(TARGETTYPE)),$(gb_Bundle_TARGETTYPEFLAGS)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 31d5c19..96b2c53 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -188,7 +188,7 @@ endif define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ - $(gb_CXX) \ + $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ $(subst \d,$$,$(RPATH)) \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 7785cd1..9169c0f 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -184,10 +184,11 @@ endif # note that `cat $(extraobjectlist)` is needed to build with older gcc versions, e.g. 4.1.2 on SLED10 # we want to use @$(extraobjectlist) in the long run +# link with C compiler if there are no C++ files (pyuno_wrapper depends on this) define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ - $(gb_CXX) \ + $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ $(if $(filter-out $(foreach lib,frm scfilt wpftdraw,$(call gb_Library_get_linktargetname,$(lib))),$*),$(gb_LTOFLAGS)) \ $(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir $(1)).$(SOVERSION)) \ commit 09373d45838e4dab514e37dee4a4c8f6218ebda0 Author: Michael Stahl <mst...@redhat.com> Date: Fri May 10 17:42:35 2013 +0200 soltools: remove Package_inc and empty unistd.h nonsense Change-Id: Ic05de69951b28b9cc8d62f0a534b507c424e6b25 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2a58722..5dbf31e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -137,26 +137,6 @@ endef endif -ifeq ($(OS)$(COM),WNTMSC) - -define gb_ExternalProject__use_unistd_headers -$(call gb_ExternalProject_use_package,$(1),soltools_inc) - -endef - -define gb_LinkTarget__use_unistd_headers -$(call gb_LinkTarget_use_package,$(1),soltools_inc) - -endef - -else # ! ($(OS)$(COM),WNTMSC) - -gb_ExternalProject__use_unistd_headers := - -gb_LinkTarget__use_unistd_headers := - -endif - ifeq ($(SYSTEM_VIGRA),YES) gb_LinkTarget__use_vigra_headers := diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l index 44484fe..166bbf6 100644 --- a/connectivity/source/parse/sqlflex.l +++ b/connectivity/source/parse/sqlflex.l @@ -110,6 +110,7 @@ OSQLScanner* xxx_pGLOBAL_SQLSCAN = NULL; %option noyywrap %option never-interactive +%option nounistd %% ABS {SQL_NEW_KEYWORD(SQL_TOKEN_ABS); } diff --git a/extensions/source/nsplugin/source/so_env.hxx b/extensions/source/nsplugin/source/so_env.hxx index d8960e5..4612522 100644 --- a/extensions/source/nsplugin/source/so_env.hxx +++ b/extensions/source/nsplugin/source/so_env.hxx @@ -33,7 +33,7 @@ #ifdef UNIX - +#include <unistd.h> #include <pthread.h> #include <sys/types.h> #include <sys/socket.h> @@ -44,7 +44,6 @@ #include <stdio.h> #include <stdlib.h> #include <ctype.h> -#include <unistd.h> #include <string.h> #define SO_SERVER_PORT 8100 diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx index 0045da3..7de1781 100644 --- a/extensions/source/nsplugin/source/so_instance.cxx +++ b/extensions/source/nsplugin/source/so_instance.cxx @@ -49,7 +49,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <unistd.h> #include <errno.h> #include "so_instance.hxx" diff --git a/extensions/source/nsplugin/source/so_main.cxx b/extensions/source/nsplugin/source/so_main.cxx index 6413f21..ba6ee2c 100644 --- a/extensions/source/nsplugin/source/so_main.cxx +++ b/extensions/source/nsplugin/source/so_main.cxx @@ -51,7 +51,6 @@ #endif #endif //end of WNT -#include <unistd.h> #include <stdio.h> #include <stdlib.h> #include <errno.h> diff --git a/idlc/Executable_idlc.mk b/idlc/Executable_idlc.mk index cef8de3..2eaa30c 100644 --- a/idlc/Executable_idlc.mk +++ b/idlc/Executable_idlc.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Executable_set_include,idlc,\ $(eval $(call gb_Executable_use_externals,idlc,\ boost_headers \ - unistd_headers \ )) $(eval $(call gb_Executable_use_libraries,idlc,\ diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l index aed48cf..ca5119f 100644 --- a/idlc/source/scanner.l +++ b/idlc/source/scanner.l @@ -261,6 +261,7 @@ static void parseLineAndFile(sal_Char* pBuf) %option noyywrap %option never-interactive +%option nounistd %x DOCU %x COMMENT diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index d23cc6f..595c027 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -36,9 +36,10 @@ #include <queue> #include <string> -#include <unistd.h> #ifdef WNT #include <direct.h> +#else +#include <unistd.h> #endif #define NO_TRANSLATE_ISO "x-no-translate" diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l index 0ecb314..a5c6988 100644 --- a/l10ntools/source/cfglex.l +++ b/l10ntools/source/cfglex.l @@ -66,6 +66,7 @@ int bText=0; %option yylineno %option never-interactive +%option nounistd %p 24000 %e 1200 diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l index 2826dce..0f21955 100644 --- a/l10ntools/source/srclex.l +++ b/l10ntools/source/srclex.l @@ -68,6 +68,7 @@ void YYWarning(); %option yylineno %option never-interactive +%option nounistd %p 24000 %e 1200 diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l index a2b5c0c..7f28d3f 100644 --- a/l10ntools/source/xrmlex.l +++ b/l10ntools/source/xrmlex.l @@ -74,6 +74,7 @@ int bText=0; %option yylineno %option never-interactive +%option nounistd %p 24000 %e 1200 diff --git a/liblangtag/UnpackedTarball_langtag.mk b/liblangtag/UnpackedTarball_langtag.mk index 572c5af..32f993a 100644 --- a/liblangtag/UnpackedTarball_langtag.mk +++ b/liblangtag/UnpackedTarball_langtag.mk @@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,langtag,\ liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch \ liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch \ liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch \ + liblangtag/liblangtag-0.5.1-unistd.patch \ )) ifeq ($(OS),WNT) diff --git a/liblangtag/liblangtag-0.5.1-unistd.patch b/liblangtag/liblangtag-0.5.1-unistd.patch new file mode 100644 index 0000000..0aebe0b --- /dev/null +++ b/liblangtag/liblangtag-0.5.1-unistd.patch @@ -0,0 +1,12 @@ +--- UnpackedTarball/langtag/liblangtag/lt-utils.c 2013-05-10 14:36:54.445200000 +0200 ++++ UnpackedTarball/langtag/liblangtag/lt-utils.c 2013-05-10 14:38:31.446000000 +0200 +@@ -23,7 +23,9 @@ + #if HAVE_STRING_H + #include <string.h> + #endif ++#if HAVE_UNISTD_H + #include <unistd.h> ++#endif + #include <sys/types.h> + #include "lt-messages.h" + #include "lt-utils.h" diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk index c62861a..5bd5361 100644 --- a/nss/ExternalProject_nss.mk +++ b/nss/ExternalProject_nss.mk @@ -9,10 +9,6 @@ $(eval $(call gb_ExternalProject_ExternalProject,nss)) -$(eval $(call gb_ExternalProject_use_externals,nss,\ - unistd_headers \ -)) - $(eval $(call gb_ExternalProject_register_targets,nss,\ configure \ build \ diff --git a/nss/nss-3.13.5-zlib-werror.patch b/nss/nss-3.13.5-zlib-werror.patch index 390dd1f..c3440c8 100644 --- a/nss/nss-3.13.5-zlib-werror.patch +++ b/nss/nss-3.13.5-zlib-werror.patch @@ -1,10 +1,12 @@ --- misc/nss-3.13.5/mozilla/security/nss/lib/zlib/gzguts.h 2010-08-22 03:07:03.000000000 +0200 +++ misc/build/nss-3.13.5/mozilla/security/nss/lib/zlib/gzguts.h 2012-07-17 08:52:14.821552788 +0200 -@@ -26,6 +26,7 @@ +@@ -26,6 +26,9 @@ # include <limits.h> #endif #include <fcntl.h> ++#ifndef _WIN32 +#include <unistd.h> ++#endif #ifdef NO_DEFLATE /* for compatibility with old definition */ # define NO_GZCOMPRESS diff --git a/redland/Library_raptor.mk b/redland/Library_raptor.mk index df666aa..a7f5af5 100644 --- a/redland/Library_raptor.mk +++ b/redland/Library_raptor.mk @@ -26,6 +26,7 @@ $(eval $(call gb_Library_add_defs,raptor2,\ -D_WINDOWS \ -D_USRDLL \ -DWIN32_EXPORTS \ + -DYY_NO_UNISTD_H \ )) $(eval $(call gb_Library_add_generated_cobjects,raptor2,\ diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index d8245d5..f095676 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -32,7 +32,6 @@ #include <osl/file.hxx> #include <osl/thread.h> #include <rtl/ustring.hxx> -#include <unistd.h> #include <signal.h> #include <stdio.h> @@ -43,6 +42,8 @@ #if ( defined WNT ) // Windows # include <windows.h> # include <tchar.h> +#else +#include <unistd.h> #endif #include "rtl/allocator.hxx" diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx index bc1e7c5..60c9b18 100644 --- a/sd/source/ui/inc/RemoteServer.hxx +++ b/sd/source/ui/inc/RemoteServer.hxx @@ -12,7 +12,9 @@ // SERVER #include <stdio.h> #include <stdlib.h> +#ifndef _WIN32 #include <unistd.h> +#endif #include <sys/types.h> #include <vector> diff --git a/sd/source/ui/remotecontrol/Communicator.hxx b/sd/source/ui/remotecontrol/Communicator.hxx index 7883401..8e1b76c 100644 --- a/sd/source/ui/remotecontrol/Communicator.hxx +++ b/sd/source/ui/remotecontrol/Communicator.hxx @@ -10,7 +10,9 @@ #define _SD_IMPRESSREMOTE_COMMUNICATOR_HXX #include <stdlib.h> +#ifndef _WIN32 #include <unistd.h> +#endif #include <sys/types.h> #include <vector> diff --git a/sd/source/ui/remotecontrol/DiscoveryService.hxx b/sd/source/ui/remotecontrol/DiscoveryService.hxx index eafca41..b47f049 100644 --- a/sd/source/ui/remotecontrol/DiscoveryService.hxx +++ b/sd/source/ui/remotecontrol/DiscoveryService.hxx @@ -11,7 +11,9 @@ #include <stdio.h> #include <stdlib.h> +#ifndef _WIN32 #include <unistd.h> +#endif #include <sys/types.h> #include <osl/socket.hxx> diff --git a/soltools/Executable_cpp.mk b/soltools/Executable_cpp.mk index f24b018..4225319 100644 --- a/soltools/Executable_cpp.mk +++ b/soltools/Executable_cpp.mk @@ -9,10 +9,6 @@ $(eval $(call gb_Executable_Executable,cpp)) -$(eval $(call gb_Executable_use_externals,cpp,\ - unistd_headers \ -)) - $(eval $(call gb_Executable_add_cobjects,cpp,\ soltools/cpp/_cpp \ soltools/cpp/_eval \ diff --git a/soltools/Executable_makedepend.mk b/soltools/Executable_makedepend.mk index e924a8d..ff61f40 100644 --- a/soltools/Executable_makedepend.mk +++ b/soltools/Executable_makedepend.mk @@ -19,10 +19,6 @@ $(eval $(call gb_Executable_add_defs,makedepend,\ -DHW_THREADS \ )) -$(eval $(call gb_Executable_use_externals,makedepend,\ - unistd_headers \ -)) - ifeq ($(COM),MSC) $(eval $(call gb_Executable_add_defs,makedepend,\ -wd4100 \ diff --git a/soltools/Module_soltools.mk b/soltools/Module_soltools.mk index 77396fd..df61745 100644 --- a/soltools/Module_soltools.mk +++ b/soltools/Module_soltools.mk @@ -14,10 +14,4 @@ $(eval $(call gb_Module_add_targets_for_build,soltools,\ Executable_makedepend \ )) -ifeq ($(OS)$(COM),WNTMSC) -$(eval $(call gb_Module_add_targets,soltools,\ - Package_inc \ -)) -endif # WNTMSC - # vim:set noet sw=4 ts=4: diff --git a/soltools/Package_inc.mk b/soltools/Package_inc.mk deleted file mode 100644 index 863945f..0000000 --- a/soltools/Package_inc.mk +++ /dev/null @@ -1,11 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,soltools_inc,$(SRCDIR)/soltools/winunistd)) -$(eval $(call gb_Package_add_file,soltools_inc,inc/unistd.h,unistd.h)) diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h index 1c0e91a..dcb3c1f 100644 --- a/soltools/mkdepend/def.h +++ b/soltools/mkdepend/def.h @@ -40,7 +40,9 @@ in this Software without prior written authorization from the X Consortium. #include <stdio.h> #include <stdlib.h> #include <string.h> +#ifndef _MSC_VER #include <unistd.h> +#endif #include <ctype.h> #ifndef X_NOT_POSIX diff --git a/soltools/winunistd/unistd.h b/soltools/winunistd/unistd.h deleted file mode 100644 index 72c253e..0000000 --- a/soltools/winunistd/unistd.h +++ /dev/null @@ -1,6 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* Dummy unistd.h for the wntmsci3 environment. Required because flex - * generates a lexical scanner which includes <unistd.h> - */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index 71c1409..929c4d7 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -21,7 +21,6 @@ #include <string.h> #include <list> -#include <unistd.h> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/weak.hxx> @@ -49,6 +48,8 @@ #if defined(SAL_W32) #include <io.h> +#else +#include <unistd.h> #endif diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index b4ace29..204bbed 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -8,7 +8,9 @@ */ #include <stdio.h> +#ifndef _WIN32 #include <unistd.h> +#endif #include <list> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits