Fix windows build

5 files changed, 19 insertions, 31 deletions

diff --git a/cpp/include/IceStorm/Service.h b/cpp/include/IceStorm/Service.h
index 9b9cc777777..db427a04a00 100644
--- a/cpp/include/IceStorm/Service.h
+++ b/cpp/include/IceStorm/Service.h
@@ -13,11 +13,11 @@
 #include <IceBox/IceBox.h>
 #include <IceStorm/IceStorm.h>
 
-#ifndef ICE_STORM_SERVICE_API
-#   ifdef ICE_STORM_SERVICE_API_EXPORTS
-#       define ICE_STORM_SERVICE_API ICE_DECLSPEC_EXPORT
+#ifndef ICE_STORM_API
+#   ifdef ICE_STORM_API_EXPORTS
+#       define ICE_STORM_API ICE_DECLSPEC_EXPORT
 #   else
-#       define ICE_STORM_SERVICE_API ICE_DECLSPEC_IMPORT
+#       define ICE_STORM_API ICE_DECLSPEC_IMPORT
 #   endif
 #endif
 
@@ -27,7 +27,7 @@ namespace IceStorm
 class Service;
 typedef ::IceInternal::Handle< ::IceStorm::Service> ServicePtr;
 
-class ICE_STORM_SERVICE_API Service : public ::IceBox::Service
+class ICE_STORM_API Service : public ::IceBox::Service
 {
 public:
 
diff --git a/cpp/src/IceStorm/KeepAliveThread.cpp b/cpp/src/IceStorm/KeepAliveThread.cpp
index 600b07df0db..6c8ad926ac9 100644
--- a/cpp/src/IceStorm/KeepAliveThread.cpp
+++ b/cpp/src/IceStorm/KeepAliveThread.cpp
@@ -115,11 +115,11 @@ KeepAliveThread::run()
 	    {
 		(*p)->keepAlive();
 	    }
-	    catch(const Ice::ObjectNotExistException& e)
+	    catch(const Ice::ObjectNotExistException&)
 	    {
 		failed(*p);
 	    }
-	    catch(const Ice::Exception& e)
+	    catch(const Ice::Exception&)
 	    {
 		if(_traceLevels->keepAlive > 1)
 		{
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index 272eba6fc97..e70235c752c 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -67,18 +67,12 @@ SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir IceStorm $(ICECPPFLAGS)
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= $(CPPFLAGS) -I.. $(READLINE_FLAGS) 
+CPPFLAGS	:= $(CPPFLAGS) -I.. -DICE_STORM_API_EXPORTS $(READLINE_FLAGS) 
 ICECPPFLAGS	:= $(ICECPPFLAGS) -I..
 SLICE2CPPFLAGS	:= --checksum --ice --dll-export ICE_STORM_API --include-dir IceStorm $(SLICE2CPPFLAGS)
 LINKWITH	:= $(BZIP2_RPATH_LINK) -lIce -lIceUtil
 SVCLINKWITH	:= $(DB_RPATH_LINK) -lFreeze -lIceBox $(BZIP2_RPATH_LINK) -lIce -lIceUtil
 
-IceStorm.o: IceStorm.cpp
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -DICE_STORM_API_EXPORTS $<
-
-%.o: %.cpp
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -DICE_STORM_SERVICE_API_EXPORTS $<
-
 $(libdir)/$(LIBFILENAME): $(OBJS)
 	rm -f $@
 	$(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH))
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak
index e8bf5286133..5d58262c6ef 100644
--- a/cpp/src/IceStorm/Makefile.mak
+++ b/cpp/src/IceStorm/Makefile.mak
@@ -68,22 +68,17 @@ SDIR		= $(slicedir)\IceStorm
 
 CPPFLAGS	= -I.. -Idummyinclude $(CPPFLAGS)
 SLICE2CPPFLAGS	= --ice --include-dir IceStorm $(SLICE2CPPFLAGS) -I..
-LINKWITH 	= $(LIBS) icestorm$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib
+LINKWITH 	= $(LIBS) freeze$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib
 ALINKWITH 	= $(LIBS) icestorm$(LIBSUFFIX).lib icexml$(LIBSUFFIX).lib
 
+SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir IceStorm -I.. -I$(slicedir)
+
 !ifndef BUILD_UTILS
 
-EXTRAFLAGS	= -DICE_STORM_SERVICE_API_EXPORTS
+CPPFLAGS	= $(CPPFLAGS) -DICE_STORM_API_EXPORTS
 
 !endif
 
-IceStorm.obj: IceStorm.cpp
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -DICE_STORM_API_EXPORTS IceStorm.cpp
-
-.cpp.obj::
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(EXTRAFLAGS) $<
-
-
 !if "$(BORLAND_HOME)" == "" & "$(OPTIMIZE)" != "yes"
 PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
 SPDBFLAGS       = /pdb:$(SVCDLLNAME:.dll=.pdb)
@@ -98,22 +93,21 @@ $(DLLNAME): $(OBJS)
 
 $(SVCLIBNAME): $(SVCDLLNAME)
 
-$(SVCDLLNAME): $(SOBJS)
-	$(LINK) $(LD_DLLFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$(SVCDLLNAME) $(PRELIBS)$(LINKWITH)
+$(SVCDLLNAME): $(SERVICE_OBJS)
+	$(LINK) $(LD_DLLFLAGS) $(SPDBFLAGS) $(SERVICE_OBJS) $(PREOUT)$(SVCDLLNAME) $(PRELIBS)$(LINKWITH)
 	move $(SVCDLLNAME:.dll=.lib) $(SVCLIBNAME)
 
 $(ADMIN): $(AOBJS)
 	$(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) $(PREOUT)$@ $(PRELIBS)$(ALINKWITH)
 
-PersistentTopicMap.h PersistentTopicMap.cpp: ../IceStorm/LinkRecord.ice $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE)
+..\IceStorm\PersistentTopicMap.h PersistentTopicMap.cpp: ..\IceStorm\LinkRecord.ice $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE)
 	del /q PersistentTopicMap.h PersistentTopicMap.cpp
-	$(SLICE2FREEZE) --dict IceStorm::PersistentTopicMap,string,IceStorm::LinkRecordDict PersistentTopicMap \
+	$(SLICE2FREEZECMD) --dict IceStorm::PersistentTopicMap,string,IceStorm::LinkRecordDict PersistentTopicMap \
 	..\IceStorm\LinkRecord.ice
 
-
-PersistentUpstreamMap.h PersistentUpstreamMap.cpp: ../IceStorm/LinkRecord.ice $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE)
+..\IceStorm\PersistentUpstreamMap.h PersistentUpstreamMap.cpp: ..\IceStorm\LinkRecord.ice $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE)
 	del /q PersistentUpstreamMap.h PersistentUpstreamMap.cpp
-	$(SLICE2FREEZE) --dict IceStorm::PersistentUpstreamMap,string,IceStorm::TopicUpstreamLinkPrxSeq \
+	$(SLICE2FREEZECMD) --dict IceStorm::PersistentUpstreamMap,string,IceStorm::TopicUpstreamLinkPrxSeq \
 	 PersistentUpstreamMap ../IceStorm/LinkRecord.ice
 
 IceStorm.cpp $(HDIR)\IceStorm.h: $(SDIR)\IceStorm.ice
diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp
index 0abd7201134..9765f093905 100644
--- a/cpp/src/IceStorm/Service.cpp
+++ b/cpp/src/IceStorm/Service.cpp
@@ -57,7 +57,7 @@ private:
 extern "C"
 {
 
-ICE_STORM_SERVICE_API ::IceBox::Service*
+ICE_STORM_API ::IceBox::Service*
 createIceStorm(CommunicatorPtr communicator)
 {
     return new ServiceI;