diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/FreezeScript/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/FreezeScript/dummyinclude/unistd.h | 4 | ||||
| -rw-r--r-- | cpp/src/IceGrid/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/IceGrid/dummyinclude/unistd.h | 4 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/IceStorm/dummyinclude/unistd.h | 4 | ||||
| -rw-r--r-- | cpp/src/IceStormLib/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/Slice/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/Slice/Util.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/Slice/dummyinclude/unistd.h | 4 |
10 files changed, 8 insertions, 22 deletions
diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak index 07780476a4a..3b0265270b9 100644 --- a/cpp/src/FreezeScript/Makefile.mak +++ b/cpp/src/FreezeScript/Makefile.mak @@ -39,7 +39,7 @@ HDIR = $(headerdir)\FreezeScript !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN +CPPFLAGS = -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN LINKWITH = slice$(LIBSUFFIX).lib icexml$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib $(LIBS) $(DB_LIBS) !if "$(GENERATE_PDB)" == "yes" diff --git a/cpp/src/FreezeScript/dummyinclude/unistd.h b/cpp/src/FreezeScript/dummyinclude/unistd.h deleted file mode 100644 index 92d53d10b9b..00000000000 --- a/cpp/src/FreezeScript/dummyinclude/unistd.h +++ /dev/null @@ -1,4 +0,0 @@ -// -// Files generated by flex need unistd.h, which is not available on -// Windows. Thus this dummy file. -// diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index c8da36d63a4..9476aa3664e 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -106,7 +106,7 @@ NLINKWITH = $(ALINKWITH) freeze$(LIBSUFFIX).lib icestorm$(LIBSUFFIX).lib icebox$ icessl$(LIBSUFFIX).lib icestormservice$(LIBSUFFIX).lib $(OPENSSL_LIBS) pdh.lib ws2_32.lib SLICE2CPPFLAGS = --checksum --ice --include-dir IceGrid $(SLICE2CPPFLAGS) -CPPFLAGS = -I. -I.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -Zm200 +CPPFLAGS = -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -Zm200 !if "$(GENERATE_PDB)" == "yes" APDBFLAGS = /pdb:$(ADMIN:.exe=.pdb) diff --git a/cpp/src/IceGrid/dummyinclude/unistd.h b/cpp/src/IceGrid/dummyinclude/unistd.h deleted file mode 100644 index 92d53d10b9b..00000000000 --- a/cpp/src/IceGrid/dummyinclude/unistd.h +++ /dev/null @@ -1,4 +0,0 @@ -// -// Files generated by flex need unistd.h, which is not available on -// Windows. Thus this dummy file. -// diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak index ce3040624b8..a162a2e2d3c 100644 --- a/cpp/src/IceStorm/Makefile.mak +++ b/cpp/src/IceStorm/Makefile.mak @@ -60,7 +60,7 @@ SLICE2FREEZECMD = $(SLICE2FREEZE) -I.. --ice --include-dir IceStorm $(ICECPPFLAG !include $(top_srcdir)\config\Make.rules.mak -CPPFLAGS = -I.. -Idummyinclude -DICE_STORM_SERVICE_API_EXPORTS $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN +CPPFLAGS = -I.. -DICE_STORM_SERVICE_API_EXPORTS $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN ICECPPFLAGS = $(ICECPPFLAGS) -I.. SLICE2CPPFLAGS = --ice --include-dir IceStorm --dll-export ICE_STORM_SERVICE_API $(SLICE2CPPFLAGS) LINKWITH = $(LIBS) icestorm$(LIBSUFFIX).lib icegrid$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib diff --git a/cpp/src/IceStorm/dummyinclude/unistd.h b/cpp/src/IceStorm/dummyinclude/unistd.h deleted file mode 100644 index 92d53d10b9b..00000000000 --- a/cpp/src/IceStorm/dummyinclude/unistd.h +++ /dev/null @@ -1,4 +0,0 @@ -// -// Files generated by flex need unistd.h, which is not available on -// Windows. Thus this dummy file. -// diff --git a/cpp/src/IceStormLib/Makefile.mak b/cpp/src/IceStormLib/Makefile.mak index 3450478bb66..dcd470adfaf 100644 --- a/cpp/src/IceStormLib/Makefile.mak +++ b/cpp/src/IceStormLib/Makefile.mak @@ -24,7 +24,7 @@ SDIR = $(slicedir)\IceStorm !include $(top_srcdir)\config\Make.rules.mak -CPPFLAGS = -I.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN +CPPFLAGS = -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN ICECPPFLAGS = $(ICECPPFLAGS) -I.. SLICE2CPPFLAGS = --ice --include-dir IceStorm --checksum --dll-export ICE_STORM_LIB_API $(SLICE2CPPFLAGS) LINKWITH = $(LIBS) $(DBLINKWITH) icestorm$(LIBSUFFIX).lib icegrid$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak index 31d73081ed3..8cf01623ff7 100644 --- a/cpp/src/Slice/Makefile.mak +++ b/cpp/src/Slice/Makefile.mak @@ -35,7 +35,7 @@ SRCS = $(OBJS:.obj=.cpp) !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I.. -Idummyinclude $(CPPFLAGS) -DSLICE_API_EXPORTS -DWIN32_LEAN_AND_MEAN +CPPFLAGS = -I.. $(CPPFLAGS) -DSLICE_API_EXPORTS -DWIN32_LEAN_AND_MEAN !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) diff --git a/cpp/src/Slice/Util.cpp b/cpp/src/Slice/Util.cpp index 2bd3d0afe5f..0fdec1b728d 100644 --- a/cpp/src/Slice/Util.cpp +++ b/cpp/src/Slice/Util.cpp @@ -13,7 +13,9 @@ #include <IceUtil/StringUtil.h> #include <climits> -#include <unistd.h> // For readlink() +#ifndef _MSC_VER +# include <unistd.h> // For readlink() +#endif using namespace std; using namespace Slice; diff --git a/cpp/src/Slice/dummyinclude/unistd.h b/cpp/src/Slice/dummyinclude/unistd.h deleted file mode 100644 index 92d53d10b9b..00000000000 --- a/cpp/src/Slice/dummyinclude/unistd.h +++ /dev/null @@ -1,4 +0,0 @@ -// -// Files generated by flex need unistd.h, which is not available on -// Windows. Thus this dummy file. -// |