don't use u_longlong_t if ACE_LACKS_U_LONGLONG_T is defined

9 files changed, 26 insertions, 12 deletions

diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 3ab0e0af14c..ac7defa2b24 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -253,7 +253,7 @@ public:
 # elif ACE_SIZEOF_LONG == 8
     typedef long LongLong;
 # elif ACE_SIZEOF_LONG_LONG == 8 && !defined (ACE_LACKS_LONGLONG_T)
-#   if defined (sun)
+#   if defined (sun) && !defined (ACE_LACKS_U_LONGLONG_T)
       // sun #defines u_longlong_t, maybe other platforms do also.
       // Use it, at least with g++, so that its -pedantic doesn't
       // complain about no ANSI C++ long long.
diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h
index 9ccaf449b06..273e82bcb52 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -131,14 +131,14 @@
 #      endif
        typedef unsigned long long ACE_UINT64;
 #    else
-     // ACE_SIZEOF_LONG_LONG is not yet known, but the platform doesn't
-     // claim ACE_LACKS_LONGLONG_T, so assume it has 8-byte long longs.
+       // ACE_SIZEOF_LONG_LONG is not yet known, but the platform doesn't
+       // claim ACE_LACKS_LONGLONG_T, so assume it has 8-byte long longs.
 #      define ACE_SIZEOF_LONG_LONG 8
-#      if defined (sun)
+#      if defined (sun) && !defined (ACE_LACKS_U_LONGLONG_T)
          // sun #defines u_longlong_t, maybe other platforms do also.
          // Use it, at least with g++, so that its -pedantic doesn't
          // complain about no ANSI C++ long long.
-           typedef u_longlong_t ACE_UINT64;
+         typedef u_longlong_t ACE_UINT64;
 #      else
          // LynxOS 2.5.0 and Linux don't have u_longlong_t.
          typedef unsigned long long ACE_UINT64;
diff --git a/ace/README b/ace/README
index 08eaf60ab60..7ec3a956fe5 100644
--- a/ace/README
+++ b/ace/README
@@ -15,6 +15,7 @@ autoconf or Larry Wall's metaconfig...
 Macro					Description
 -----					-----------
 
+ACE_CAST_CONST                          Used to work around broken SunCC ANSI casts that require an extra const.
 ACE_HAS_ANSI_CASTS                      Platform supports new C++ style casts (dynamic_cast, static_cast, reinterpret_cast and const_cast)
 ACE_DEFAULT_THREAD_KEYS                 Number of TSS keys, with ACE_HAS_TSS_EMULATION _only_.  Defaults to 64.
 ACE_THREADS_DONT_INHERIT_LOG_MSG		Specify this if you don't want threads to inherit parent thread's ACE_Log_Msg properties.
@@ -286,13 +287,14 @@ ACE_LACKS_T_ERRNO			Header files lack t_errno for TLI
 ACE_LACKS_TCP_H				Platform doesn't have netinet/tcp.h
 ACE_LACKS_THREAD_STACK_SIZE		Platform lacks pthread_attr_setstacksize() (e.g., Linux pthreads)
 ACE_LACKS_TIMEDWAIT_PROTOTYPES		MIT pthreads platform lacks the timedwait prototypes
+ACE_LACKS_U_LONGLONG_T                  Platform does not have u_longlong_t typedef, and "sun" is defined.
 ACE_LACKS_UALARM_PROTOTYPE		Platform/compiler lacks the ualarm() prototype (e.g., Solaris)
 ACE_LACKS_UCONTEXT_H			Platform lacks the ucontext.h file
 ACE_LACKS_UNISTD_H                      Platform lacks the unistd.h file (e.g., VxWorks and Win32)
 ACE_LACKS_UNIX_DOMAIN_SOCKETS		ACE platform has no UNIX domain sockets
 ACE_LACKS_UNIX_SIGNALS			Platform lacks full signal support (e.g., Win32 and Chorus).
 ACE_LACKS_UTSNAME_T			Platform lacks struct utsname (e.g., Win32 and VxWorks)
-ACE_MAIN				Renames "main (int, char *[])" to ace_main (int, char *[]), for platforms such as g++/VxWorks that don't allow main.  Requires the use of ACE_HAS_NONSTATIC_OBJECT_MANAGER.
+ACE_MAIN				Renames "main (int, char *[])", for platforms such as g++/VxWorks that don't allow main.  Requires the use of ACE_HAS_NONSTATIC_OBJECT_MANAGER.
 ACE_MT_SAFE				Compile using multi-thread libraries
 ACE_NDEBUG				Turns off debugging features
 ACE_NEEDS_DEV_IO_CONVERSION		Necessary with some compilers
diff --git a/ace/config-sunos4-g++.h b/ace/config-sunos4-g++.h
index e33e55fd5c6..ac83a67b5ff 100644
--- a/ace/config-sunos4-g++.h
+++ b/ace/config-sunos4-g++.h
@@ -79,6 +79,8 @@
 // Platform has ACE_TLI.
 // #define ACE_HAS_TLI
 
+#define ACE_LACKS_U_LONGLONG_T
+
 // 10 millisecond fudge factor to account for Solaris timers...
 #if !defined (ACE_TIMER_SKEW)
 #define ACE_TIMER_SKEW 1000 * 10
diff --git a/ace/config-sunos4-lucid3.2.h b/ace/config-sunos4-lucid3.2.h
index 1df467ccbcf..8b3298ce913 100644
--- a/ace/config-sunos4-lucid3.2.h
+++ b/ace/config-sunos4-lucid3.2.h
@@ -16,7 +16,7 @@
 #define ACE_HAS_UNION_WAIT
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC			
+#define ACE_HAS_SYSV_IPC
 
 // Platform supports recvmsg and sendmsg.
 #define ACE_HAS_MSG
@@ -25,7 +25,7 @@
 #define ACE_HAS_SYSCALL_H
 
 // Compiler/platform supports alloca()
-#define ACE_HAS_ALLOCA 
+#define ACE_HAS_ALLOCA
 
 // Compiler/platform has <alloca.h>
 #define ACE_HAS_ALLOCA_H
@@ -83,6 +83,8 @@
 
 #define ACE_NEEDS_DEV_IO_CONVERSION
 
+#define ACE_LACKS_U_LONGLONG_T
+
 // 10 millisecond fudge factor to account for Solaris timers...
 #if !defined (ACE_TIMER_SKEW)
 #define ACE_TIMER_SKEW 1000 * 10
diff --git a/ace/config-sunos4-sun3.x.h b/ace/config-sunos4-sun3.x.h
index bc0e6b98392..911fb9d59ac 100644
--- a/ace/config-sunos4-sun3.x.h
+++ b/ace/config-sunos4-sun3.x.h
@@ -20,7 +20,7 @@
 #define ACE_HAS_SYS_ERRLIST
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC			
+#define ACE_HAS_SYSV_IPC
 
 // Platform supports recvmsg and sendmsg.
 #define ACE_HAS_MSG
@@ -78,6 +78,8 @@
 
 #define ACE_NEEDS_DEV_IO_CONVERSION
 
+#define ACE_LACKS_U_LONGLONG_T
+
 // 10 millisecond fudge factor to account for Solaris timers...
 #if !defined (ACE_TIMER_SKEW)
 #define ACE_TIMER_SKEW 1000 * 10
diff --git a/ace/config-sunos4-sun4.1.4.h b/ace/config-sunos4-sun4.1.4.h
index 47a57826875..1ea5ba21a97 100644
--- a/ace/config-sunos4-sun4.1.4.h
+++ b/ace/config-sunos4-sun4.1.4.h
@@ -20,7 +20,7 @@
 #define ACE_LACKS_POSIX_PROTOTYPES
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC			
+#define ACE_HAS_SYSV_IPC
 
 // Platform supports recvmsg and sendmsg.
 #define ACE_HAS_MSG
@@ -85,6 +85,8 @@
 
 #define ACE_NEEDS_DEV_IO_CONVERSION
 
+#define ACE_LACKS_U_LONGLONG_T
+
 // 10 millisecond fudge factor to account for Solaris timers...
 #if !defined (ACE_TIMER_SKEW)
 #define ACE_TIMER_SKEW 1000 * 10
diff --git a/ace/config-sunos4-sun4.x-orbix.h b/ace/config-sunos4-sun4.x-orbix.h
index b3efead4bc9..41f60b10ed0 100644
--- a/ace/config-sunos4-sun4.x-orbix.h
+++ b/ace/config-sunos4-sun4.x-orbix.h
@@ -15,7 +15,7 @@
 #define ACE_HAS_UNION_WAIT
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC			
+#define ACE_HAS_SYSV_IPC
 
 // Platform supports recvmsg and sendmsg.
 #define ACE_HAS_MSG
@@ -86,6 +86,8 @@
 
 #define ACE_NEEDS_DEV_IO_CONVERSION
 
+#define ACE_LACKS_U_LONGLONG_T
+
 // 10 millisecond fudge factor to account for Solaris timers...
 #if !defined (ACE_TIMER_SKEW)
 #define ACE_TIMER_SKEW 1000 * 10
diff --git a/ace/config-sunos4-sun4.x.h b/ace/config-sunos4-sun4.x.h
index 7d6f480b037..00659f4b743 100644
--- a/ace/config-sunos4-sun4.x.h
+++ b/ace/config-sunos4-sun4.x.h
@@ -18,7 +18,7 @@
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC			
+#define ACE_HAS_SYSV_IPC
 
 // Platform supports recvmsg and sendmsg.
 #define ACE_HAS_MSG
@@ -83,6 +83,8 @@
 
 #define ACE_NEEDS_DEV_IO_CONVERSION
 
+#define ACE_LACKS_U_LONGLONG_T
+
 // 10 millisecond fudge factor to account for Solaris timers...
 #if !defined (ACE_TIMER_SKEW)
 #define ACE_TIMER_SKEW 1000 * 10