diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/Makefile | 1 | ||||
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceUtil/CtrlCHandler.cpp | 7 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile index 62cac392f5e..ecf603ea855 100644 --- a/cpp/src/Freeze/Makefile +++ b/cpp/src/Freeze/Makefile @@ -18,7 +18,6 @@ TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(li OBJS = CatalogData.o \ Catalog.o \ - ConnectionF.o \ ConnectionF.o \ ConnectionI.o \ Connection.o \ diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 5ea6148ff47..c69a3eb0fcd 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -15,7 +15,7 @@ using namespace Ice; using namespace IceInternal; #ifdef __sun -# define INADDR_NONE -1 +# define INADDR_NONE (unsigned long)-1 #endif bool diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp index 78b3e2ec298..11a7310eee1 100644 --- a/cpp/src/IceUtil/CtrlCHandler.cpp +++ b/cpp/src/IceUtil/CtrlCHandler.cpp @@ -7,13 +7,14 @@ // // ********************************************************************** +#ifdef __sun +# define _POSIX_PTHREAD_SEMANTICS +#endif + #include <IceUtil/CtrlCHandler.h> #include <IceUtil/StaticMutex.h> #ifndef _WIN32 -# ifdef __sun -# define _POSIX_PTHREAD_SEMANTICS -# endif # include <signal.h> #endif |