ChangeLogTag: Fri Mar 25 09:27:40 2005 J.T. Conklin <jtc@acorntoolworks.com>

3 files changed, 15 insertions, 72 deletions

diff --git a/ChangeLog b/ChangeLog
index 00e549f4ec0..f1cd97f27c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Fri Mar 25 09:27:40 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* configure.ac:
+	* m4/config_h.m4:
+
+	  Removed ACE_{,U}INT64_TYPEDEF macros.  These resulted in
+	  preprocessor conditionals used to set ACE_{,U}INT64.  Now that
+	  Basic_Types.h has been refactored, config headers can override
+	  it by defining ACE_{,U}INT{8,16,32,64}_TYPE.  We will use that
+	  generalized infrastructure instead.
+
 Fri Mar 25 07:49:08 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
 	* ace/Basic_Types.h:
diff --git a/configure.ac b/configure.ac
index 2b50d2da88b..d2e68a3876b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7248,8 +7248,10 @@ dnl
 
 dnl Make final substitutions and defines
 if test "$ace_u_long_long_typedef_set" = yes; then
-  AC_DEFINE_UNQUOTED([ACE_INT64_TYPEDEF], [$ACE_INT64])
-  AC_DEFINE_UNQUOTED([ACE_UINT64_TYPEDEF], [$ACE_UINT64])
+  AC_DEFINE_UNQUOTED([ACE_INT64_TYPE], [$ACE_INT64],
+	[Define to signed 64 bit integer type])
+  AC_DEFINE_UNQUOTED([ACE_UINT64_TYPE], [$ACE_UINT64],
+	[Define to unsigned 64 bit integer type])
 fi
 
 dnl Combine package set flags with user's flags.
@@ -7287,13 +7289,6 @@ ACE_CACHE_CHECK([if generated ACE configuration is usable],
       dnl Now run the compilation test
       ACE_TRY_COMPILE([-I. -I${srcdir}],
         [
-#if defined(ACE_INT64_TYPEDEF)
-  typedef ACE_INT64_TYPEDEF ACE_INT64;
-#endif /* ACE_INT64_TYPEDEF */
-#if defined(ACE_UINT64_TYPEDEF)
-  typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF */
-
 // Include ".cpp" files instead of headers so that we can get a more
 // thorough test compile.
 #include "ace/Time_Value.cpp"
@@ -7363,13 +7358,6 @@ ACE_CACHE_CHECK([for ACE_IOStream support],
       dnl Now run the compilation test
       ACE_TRY_COMPILE([-I. -I${srcdir}],
         [
-#if defined(ACE_INT64_TYPEDEF)
-  typedef ACE_INT64_TYPEDEF ACE_INT64;
-#endif /* ACE_INT64_TYPEDEF */
-#if defined(ACE_UINT64_TYPEDEF)
-  typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF */
-
 #include "ace/IOStream.cpp"
         ],
         [
@@ -7399,13 +7387,6 @@ ACE_CACHE_CHECK([for ACE_addr::sap_any support],
       dnl Now run the compilation test
       ACE_TRY_COMPILE([-I. -I${srcdir}],
         [
-#if defined(ACE_INT64_TYPEDEF)
-  typedef ACE_INT64_TYPEDEF ACE_INT64;
-#endif /* ACE_INT64_TYPEDEF */
-#if defined(ACE_UINT64_TYPEDEF)
-  typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF */
-
 #include "ace/FILE_Addr.h"
         ],
         [
@@ -7419,13 +7400,6 @@ ACE_CACHE_CHECK([for ACE_addr::sap_any support],
          dnl compilation work!
          ACE_TRY_COMPILE([-I. -I${srcdir}],
            [
-#if defined(ACE_INT64_TYPEDEF)
-  typedef ACE_INT64_TYPEDEF ACE_INT64;
-#endif /* ACE_INT64_TYPEDEF */
-#if defined(ACE_UINT64_TYPEDEF)
-  typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF */
-
 #define ACE_HAS_BROKEN_SAP_ANY
 #include "ace/FILE_Addr.h"
            ],
@@ -7454,13 +7428,6 @@ ACE_CACHE_CHECK([if ACE needs conversion to pass ACE_TTY_IO to DEV_Connector],
       dnl Now run the compilation test
       ACE_TRY_COMPILE([-I. -I${srcdir}],
         [
-#if defined(ACE_INT64_TYPEDEF)
-  typedef ACE_INT64_TYPEDEF ACE_INT64;
-#endif /* ACE_INT64_TYPEDEF */
-#if defined(ACE_UINT64_TYPEDEF)
-  typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF */
-
 #include "ace/OS.cpp"
         ],
         [
@@ -7474,13 +7441,6 @@ ACE_CACHE_CHECK([if ACE needs conversion to pass ACE_TTY_IO to DEV_Connector],
          dnl compilation work!
          ACE_TRY_COMPILE([-I. -I${srcdir}],
            [
-#if defined(ACE_INT64_TYPEDEF)
-  typedef ACE_INT64_TYPEDEF ACE_INT64;
-#endif /* ACE_INT64_TYPEDEF */
-#if defined(ACE_UINT64_TYPEDEF)
-  typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF */
-
 #define ACE_NEEDS_DEV_IO_CONVERSION
 #include "ace/DEV_Connector.cpp"
            ],
diff --git a/m4/config_h.m4 b/m4/config_h.m4
index 045a3bbec00..875ef9d803e 100644
--- a/m4/config_h.m4
+++ b/m4/config_h.m4
@@ -204,34 +204,6 @@ AH_TEMPLATE([ACE_USE_RCSID],[Enable embedding of global RCS ID strings into comp
 AH_TEMPLATE([IP_ADD_MEMBERSHIP],[])
 AH_TEMPLATE([IP_DROP_MEMBERSHIP],[])
 
-AH_VERBATIM([ACE_INT64_TYPEDEF],
-[
-/*
-   typedef for ACE_INT64
-
-   We only make the typedef if ACE_INT64_TYPEDEF is defined.  Otherwise,
-   let ace/Basic_Types.h do the work for us.
-*/
-#undef ACE_INT64_TYPEDEF
-#ifdef ACE_INT64_TYPEDEF
-   typedef ACE_INT64_TYPEDEF ACE_INT64;
-#endif /* ACE_INT64_TYPEDEF */
-])
-
-AH_VERBATIM([ACE_UINT64_TYPEDEF],
-[
-/*
-   typedef for ACE_UINT64
-
-   We only make the typedef if ACE_UINT64_TYPEDEF is defined.  Otherwise,
-   let ace/Basic_Types.h do the work for us.
-*/
-#undef ACE_UINT64_TYPEDEF
-#ifdef ACE_UINT64_TYPEDEF
-   typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF */
-])
-
 AH_TEMPLATE([ACE_LOFF_T_TYPEDEF],[typedef for ACE_LOFF_T])
 
 AH_TEMPLATE([__ACE_INLINE__],[Enable ACE inlining])