diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2010-05-31 12:45:42 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2010-05-31 12:45:42 -0230 |
| commit | 613552a27a3c80978a3d24f04bfdc89d5080b5c1 (patch) | |
| tree | c903a09aba2c14e0293d4c63d6551ac93bf2252c /cpp/src | |
| parent | typo in INSTALL.WINDOWS (diff) | |
| download | ice-613552a27a3c80978a3d24f04bfdc89d5080b5c1.tar.bz2 ice-613552a27a3c80978a3d24f04bfdc89d5080b5c1.tar.xz ice-613552a27a3c80978a3d24f04bfdc89d5080b5c1.zip | |
Bug 4759 - remove FD_SETSIZE from compile flags
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/Makefile.mak | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index 8889aa1d7fa..8c5907b647e 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -115,7 +115,7 @@ SDIR = $(slicedir)\Ice !include $(top_srcdir)\config\Make.rules.mak
-CPPFLAGS = -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DFD_SETSIZE=1024 -DWIN32_LEAN_AND_MEAN
+CPPFLAGS = -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DWIN32_LEAN_AND_MEAN
!if "$(UNIQUE_DLL_NAMES)" == "yes"
CPPFLAGS = $(CPPFLAGS) -DCOMPSUFFIX=\"$(COMPSUFFIX)\"
!endif
diff --git a/cpp/src/IceSSL/Makefile.mak b/cpp/src/IceSSL/Makefile.mak index 26d95898499..26f7441ca4a 100644 --- a/cpp/src/IceSSL/Makefile.mak +++ b/cpp/src/IceSSL/Makefile.mak @@ -34,7 +34,7 @@ SDIR = $(slicedir)\IceSSL !include $(top_srcdir)/config/Make.rules.mak
-CPPFLAGS = -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS -DFD_SETSIZE=1024 -DWIN32_LEAN_AND_MEAN
+CPPFLAGS = -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS -DWIN32_LEAN_AND_MEAN
SLICE2CPPFLAGS = --ice --include-dir IceSSL --dll-export ICE_SSL_API $(SLICE2CPPFLAGS)
LINKWITH = $(OPENSSL_LIBS) $(LIBS) ws2_32.lib
|