[Pkg-ace-commits] [pkg-ace] r668 - trunk/debian

[Thomas Girard]

Author: tgg
Date: 2010-05-10 18:28:25 +0000 (Mon, 10 May 2010)
New Revision: 668

Modified:
   trunk/debian/config.h
Log:
Make sure Debian settings are preserved after compilation


Modified: trunk/debian/config.h
===================================================================
--- trunk/debian/config.h	2010-05-10 07:40:40 UTC (rev 667)
+++ trunk/debian/config.h	2010-05-10 18:28:25 UTC (rev 668)
@@ -1,6 +1,28 @@
 #ifndef ACE_CONFIG_H_INCLUDED
 #define ACE_CONFIG_H_INCLUDED
+
+/*
+ * Macros that were enabled in Debian are stored here.
+ *
+ * Rationale: those were captured in the generated libraries on
+ * compilation; hence the same values must be used when including
+ * ACE+TAO headers, to avoid unexpected results.
+ */
+#ifndef ACE_HAS_IPV6
 #define ACE_HAS_IPV6 1
+#endif
+
+#ifndef ACE_USES_IPV4_IPV6_MIGRATION
 #define ACE_USES_IPV4_IPV6_MIGRATION 1
+#endif
+
+#ifndef __ACE_INLINE__
+#define __ACE_INLINE__
+#endif
+
+#ifndef ACE_HAS_EXCEPTIONS
+#define ACE_HAS_EXCEPTIONS
+#endif
+
 #include "config-linux.h"
 #endif /* ACE_CONFIG_H_INCLUDED */