Removed ICE_PROTOCOL_API

17 files changed, 70 insertions, 78 deletions

diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index 538783a4096..723e5fece03 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -52,14 +52,6 @@ namespace IceInternal
 #    endif
 #endif
 
-#ifndef ICE_PROTOCOL_API 
-#   ifdef ICE_PROTOCOL_API_EXPORTS
-#       define ICE_PROTOCOL_API ICE_DECLSPEC_EXPORT
-#   else
-#       define ICE_PROTOCOL_API ICE_DECLSPEC_IMPORT
-#   endif
-#endif
-
 namespace Ice
 {
 
diff --git a/cpp/include/Ice/EndpointFactory.h b/cpp/include/Ice/EndpointFactory.h
index fdd91902c1a..9aa7a9b3ece 100644
--- a/cpp/include/Ice/EndpointFactory.h
+++ b/cpp/include/Ice/EndpointFactory.h
@@ -19,7 +19,7 @@ namespace IceInternal
 
 class BasicStream;
 
-class ICE_PROTOCOL_API EndpointFactory : public ::IceUtil::Shared
+class ICE_API EndpointFactory : public ::IceUtil::Shared
 {
 public:
 
diff --git a/cpp/include/Ice/EndpointFactoryF.h b/cpp/include/Ice/EndpointFactoryF.h
index 6a0aab9255a..38017c6d576 100644
--- a/cpp/include/Ice/EndpointFactoryF.h
+++ b/cpp/include/Ice/EndpointFactoryF.h
@@ -16,8 +16,8 @@ namespace IceInternal
 {
 
 class EndpointFactory;
-ICE_PROTOCOL_API void incRef(EndpointFactory*);
-ICE_PROTOCOL_API void decRef(EndpointFactory*);
+ICE_API void incRef(EndpointFactory*);
+ICE_API void decRef(EndpointFactory*);
 typedef Handle<EndpointFactory> EndpointFactoryPtr;
 
 }
diff --git a/cpp/include/Ice/IncomingAsyncF.h b/cpp/include/Ice/IncomingAsyncF.h
index 2ce4f39984d..7e1bcaebafc 100644
--- a/cpp/include/Ice/IncomingAsyncF.h
+++ b/cpp/include/Ice/IncomingAsyncF.h
@@ -16,8 +16,8 @@ namespace IceInternal
 {
 
 class IncomingAsync;
-ICE_PROTOCOL_API void incRef(IncomingAsync*);
-ICE_PROTOCOL_API void decRef(IncomingAsync*);
+ICE_API void incRef(IncomingAsync*);
+ICE_API void decRef(IncomingAsync*);
 typedef IceInternal::Handle<IncomingAsync> IncomingAsyncPtr;
 
 }
diff --git a/cpp/include/Ice/OutgoingAsyncF.h b/cpp/include/Ice/OutgoingAsyncF.h
index 83d53f80eda..a17c03a0e14 100644
--- a/cpp/include/Ice/OutgoingAsyncF.h
+++ b/cpp/include/Ice/OutgoingAsyncF.h
@@ -16,8 +16,8 @@ namespace IceInternal
 {
 
 class OutgoingAsync;
-ICE_PROTOCOL_API void incRef(OutgoingAsync*);
-ICE_PROTOCOL_API void decRef(OutgoingAsync*);
+ICE_API void incRef(OutgoingAsync*);
+ICE_API void decRef(OutgoingAsync*);
 typedef IceInternal::Handle<OutgoingAsync> OutgoingAsyncPtr;
 
 }
diff --git a/cpp/include/Ice/ProtocolPluginFacade.h b/cpp/include/Ice/ProtocolPluginFacade.h
index 3481016b5a4..b6b373dea8e 100644
--- a/cpp/include/Ice/ProtocolPluginFacade.h
+++ b/cpp/include/Ice/ProtocolPluginFacade.h
@@ -23,13 +23,13 @@ namespace IceInternal
 // Global function to obtain a ProtocolPluginFacade given a Communicator
 // instance.
 //
-ICE_PROTOCOL_API ProtocolPluginFacadePtr getProtocolPluginFacade(const Ice::CommunicatorPtr&);
+ICE_API ProtocolPluginFacadePtr getProtocolPluginFacade(const Ice::CommunicatorPtr&);
 
 //
 // ProtocolPluginFacade wraps the internal operations that protocol
 // plug-ins may need.
 //
-class ICE_PROTOCOL_API ProtocolPluginFacade : public ::IceUtil::Shared
+class ICE_API ProtocolPluginFacade : public ::IceUtil::Shared
 {
 public:
 
@@ -59,7 +59,7 @@ private:
 
     ProtocolPluginFacade(const Ice::CommunicatorPtr&);
 
-    friend ICE_PROTOCOL_API ProtocolPluginFacadePtr getProtocolPluginFacade(const Ice::CommunicatorPtr&);
+    friend ICE_API ProtocolPluginFacadePtr getProtocolPluginFacade(const Ice::CommunicatorPtr&);
 
     InstancePtr _instance;
     Ice::CommunicatorPtr _communicator;
diff --git a/cpp/include/Ice/ProtocolPluginFacadeF.h b/cpp/include/Ice/ProtocolPluginFacadeF.h
index 326197b2d27..56388c800d0 100644
--- a/cpp/include/Ice/ProtocolPluginFacadeF.h
+++ b/cpp/include/Ice/ProtocolPluginFacadeF.h
@@ -16,8 +16,8 @@ namespace IceInternal
 {
 
 class ProtocolPluginFacade;
-ICE_PROTOCOL_API void incRef(ProtocolPluginFacade*);
-ICE_PROTOCOL_API void decRef(ProtocolPluginFacade*);
+ICE_API void incRef(ProtocolPluginFacade*);
+ICE_API void decRef(ProtocolPluginFacade*);
 typedef Handle<ProtocolPluginFacade> ProtocolPluginFacadePtr;
 
 }
diff --git a/cpp/src/Ice/Acceptor.h b/cpp/src/Ice/Acceptor.h
index fa7d3f554d7..5d223868861 100644
--- a/cpp/src/Ice/Acceptor.h
+++ b/cpp/src/Ice/Acceptor.h
@@ -24,7 +24,7 @@ typedef int ssize_t;
 namespace IceInternal
 {
 
-class ICE_PROTOCOL_API Acceptor : public ::IceUtil::Shared
+class ICE_API Acceptor : public ::IceUtil::Shared
 {
 public:
 
diff --git a/cpp/src/Ice/AcceptorF.h b/cpp/src/Ice/AcceptorF.h
index 2122cfec592..7c40b9e6016 100644
--- a/cpp/src/Ice/AcceptorF.h
+++ b/cpp/src/Ice/AcceptorF.h
@@ -16,8 +16,8 @@ namespace IceInternal
 {
 
 class Acceptor;
-ICE_PROTOCOL_API void incRef(Acceptor*);
-ICE_PROTOCOL_API void decRef(Acceptor*);
+ICE_API void incRef(Acceptor*);
+ICE_API void decRef(Acceptor*);
 typedef Handle<Acceptor> AcceptorPtr;
 
 }
diff --git a/cpp/src/Ice/Connector.h b/cpp/src/Ice/Connector.h
index 083bc2c91c1..16f8626dd43 100644
--- a/cpp/src/Ice/Connector.h
+++ b/cpp/src/Ice/Connector.h
@@ -17,7 +17,7 @@
 namespace IceInternal
 {
 
-class ICE_PROTOCOL_API Connector : public ::IceUtil::Shared
+class ICE_API Connector : public ::IceUtil::Shared
 {
 public:
     
diff --git a/cpp/src/Ice/ConnectorF.h b/cpp/src/Ice/ConnectorF.h
index 5516a072615..74182e48b32 100644
--- a/cpp/src/Ice/ConnectorF.h
+++ b/cpp/src/Ice/ConnectorF.h
@@ -16,8 +16,8 @@ namespace IceInternal
 {
 
 class Connector;
-ICE_PROTOCOL_API void incRef(Connector*);
-ICE_PROTOCOL_API void decRef(Connector*);
+ICE_API void incRef(Connector*);
+ICE_API void decRef(Connector*);
 typedef Handle<Connector> ConnectorPtr;
 
 }
diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h
index 5524c142a06..2114bd0f35c 100644
--- a/cpp/src/Ice/EndpointI.h
+++ b/cpp/src/Ice/EndpointI.h
@@ -23,7 +23,7 @@ namespace IceInternal
 
 class BasicStream;
 
-class ICE_PROTOCOL_API EndpointI : public Ice::Endpoint
+class ICE_API EndpointI : public Ice::Endpoint
 {
 public:
 
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index d4c7c5149d4..b902dfba4b6 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -151,7 +151,7 @@ SDIR		= $(slicedir)/Ice
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DICE_PROTOCOL_API_EXPORTS $(BZIP2_FLAGS)
+CPPFLAGS	:= -I.. $(CPPFLAGS) -DICE_API_EXPORTS $(BZIP2_FLAGS)
 SLICE2CPPFLAGS	:= --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS)
 
 LINKWITH        := -lIceUtil $(BZIP2_LIBS) $(ICE_OS_LIBS)
diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h
index 4ed073639b0..d6ed48a6f07 100644
--- a/cpp/src/Ice/Network.h
+++ b/cpp/src/Ice/Network.h
@@ -69,55 +69,55 @@ typedef int socklen_t;
 namespace IceInternal
 {
 
-ICE_PROTOCOL_API bool interrupted();
-ICE_PROTOCOL_API bool acceptInterrupted();
-ICE_PROTOCOL_API bool noBuffers();
-ICE_PROTOCOL_API bool wouldBlock();
-ICE_PROTOCOL_API bool connectFailed();
-ICE_PROTOCOL_API bool connectionRefused();
-ICE_PROTOCOL_API bool connectInProgress();
-ICE_PROTOCOL_API bool connectionLost();
-ICE_PROTOCOL_API bool notConnected();
-ICE_PROTOCOL_API bool recvTruncated();
-
-ICE_PROTOCOL_API SOCKET createSocket(bool);
-ICE_PROTOCOL_API void closeSocket(SOCKET);
-ICE_PROTOCOL_API void shutdownSocketWrite(SOCKET);
-ICE_PROTOCOL_API void shutdownSocketReadWrite(SOCKET);
-
-ICE_PROTOCOL_API void setBlock(SOCKET, bool);
-ICE_PROTOCOL_API void setTcpNoDelay(SOCKET);
-ICE_PROTOCOL_API void setKeepAlive(SOCKET);
-ICE_PROTOCOL_API void setSendBufferSize(SOCKET, int);
-ICE_PROTOCOL_API int getSendBufferSize(SOCKET);
-ICE_PROTOCOL_API void setRecvBufferSize(SOCKET, int);
-ICE_PROTOCOL_API int getRecvBufferSize(SOCKET);
-
-ICE_PROTOCOL_API void doBind(SOCKET, struct sockaddr_in&);
-ICE_PROTOCOL_API void doListen(SOCKET, int);
-ICE_PROTOCOL_API void doConnect(SOCKET, struct sockaddr_in&, int);
-ICE_PROTOCOL_API SOCKET doAccept(SOCKET, int);
-
-ICE_PROTOCOL_API void getAddress(const std::string&, int, struct sockaddr_in&);
-ICE_PROTOCOL_API std::string getLocalHost(bool);
-ICE_PROTOCOL_API bool compareAddress(const struct sockaddr_in&, const struct sockaddr_in&);
-
-ICE_PROTOCOL_API void createPipe(SOCKET fds[2]);
-
-ICE_PROTOCOL_API std::string errorToString(int);
-ICE_PROTOCOL_API std::string errorToStringDNS(int);
-ICE_PROTOCOL_API std::string lastErrorToString();
-
-ICE_PROTOCOL_API std::string fdToString(SOCKET);
-ICE_PROTOCOL_API std::string addrToString(const struct sockaddr_in&);
+ICE_API bool interrupted();
+ICE_API bool acceptInterrupted();
+ICE_API bool noBuffers();
+ICE_API bool wouldBlock();
+ICE_API bool connectFailed();
+ICE_API bool connectionRefused();
+ICE_API bool connectInProgress();
+ICE_API bool connectionLost();
+ICE_API bool notConnected();
+ICE_API bool recvTruncated();
+
+ICE_API SOCKET createSocket(bool);
+ICE_API void closeSocket(SOCKET);
+ICE_API void shutdownSocketWrite(SOCKET);
+ICE_API void shutdownSocketReadWrite(SOCKET);
+
+ICE_API void setBlock(SOCKET, bool);
+ICE_API void setTcpNoDelay(SOCKET);
+ICE_API void setKeepAlive(SOCKET);
+ICE_API void setSendBufferSize(SOCKET, int);
+ICE_API int getSendBufferSize(SOCKET);
+ICE_API void setRecvBufferSize(SOCKET, int);
+ICE_API int getRecvBufferSize(SOCKET);
+
+ICE_API void doBind(SOCKET, struct sockaddr_in&);
+ICE_API void doListen(SOCKET, int);
+ICE_API void doConnect(SOCKET, struct sockaddr_in&, int);
+ICE_API SOCKET doAccept(SOCKET, int);
+
+ICE_API void getAddress(const std::string&, int, struct sockaddr_in&);
+ICE_API std::string getLocalHost(bool);
+ICE_API bool compareAddress(const struct sockaddr_in&, const struct sockaddr_in&);
+
+ICE_API void createPipe(SOCKET fds[2]);
+
+ICE_API std::string errorToString(int);
+ICE_API std::string errorToStringDNS(int);
+ICE_API std::string lastErrorToString();
+
+ICE_API std::string fdToString(SOCKET);
+ICE_API std::string addrToString(const struct sockaddr_in&);
 
 #ifdef _WIN32
-ICE_PROTOCOL_API std::vector<struct sockaddr_in> getLocalAddresses();
-ICE_PROTOCOL_API bool isLocalAddress(const struct sockaddr_in&);
-ICE_PROTOCOL_API bool isPeerLocal(SOCKET);
+ICE_API std::vector<struct sockaddr_in> getLocalAddresses();
+ICE_API bool isLocalAddress(const struct sockaddr_in&);
+ICE_API bool isPeerLocal(SOCKET);
 #endif
 
-ICE_PROTOCOL_API int getSocketErrno();
+ICE_API int getSocketErrno();
 
 }
 
diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h
index 233f87ce76f..c05169af7aa 100644
--- a/cpp/src/Ice/Transceiver.h
+++ b/cpp/src/Ice/Transceiver.h
@@ -25,7 +25,7 @@ namespace IceInternal
 
 class Buffer;
 
-class ICE_PROTOCOL_API Transceiver : public ::IceUtil::Shared
+class ICE_API Transceiver : public ::IceUtil::Shared
 {
 public:
     
diff --git a/cpp/src/Ice/TransceiverF.h b/cpp/src/Ice/TransceiverF.h
index abf98380df6..4b528fff1b9 100644
--- a/cpp/src/Ice/TransceiverF.h
+++ b/cpp/src/Ice/TransceiverF.h
@@ -16,8 +16,8 @@ namespace IceInternal
 {
 
 class Transceiver;
-ICE_PROTOCOL_API void incRef(Transceiver*);
-ICE_PROTOCOL_API void decRef(Transceiver*);
+ICE_API void incRef(Transceiver*);
+ICE_API void decRef(Transceiver*);
 typedef Handle<Transceiver> TransceiverPtr;
 
 }
diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp
index 0985002f558..cd033e26ac7 100644
--- a/cpp/src/Ice/ice.dsp
+++ b/cpp/src/Ice/ice.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I ".." /I "../../include" /D FD_SETSIZE=1024 /D "_USRDLL" /D "ICE_API_EXPORTS" /D "ICE_PROTOCOL_API_EXPORTS" /D "_CONSOLE" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /c

+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I ".." /I "../../include" /D FD_SETSIZE=1024 /D "_USRDLL" /D "ICE_API_EXPORTS" /D "_CONSOLE" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /c

 # SUBTRACT CPP /Fr /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -76,7 +76,7 @@ PostBuild_Cmds=copy $(OutDir)\ice.lib ..\..\lib	copy $(OutDir)\ice30.dll ..\..\b
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_USRDLL" /D "ICE_API_EXPORTS" /D "ICE_PROTOCOL_API_EXPORTS" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_USRDLL" /D "ICE_API_EXPORTS" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c

 # SUBTRACT CPP /Fr /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32