summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-08-23 23:36:25 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-08-23 23:36:25 +0000
commit9d13a00913f57d3f21c0dedb766c04a6e04228c0 (patch)
treebf32efacfa5e59fa19cc3ab27a0e3a8375258082
parentcd8f958b4ea1b79fddd684a9f1c110af7876580e (diff)
downloadATCD-9d13a00913f57d3f21c0dedb766c04a6e04228c0.tar.gz
ChangeLogTag: Mon Aug 23 16:33:59 2004 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--ChangeLog14
-rw-r--r--ace/config-netbsd.h23
2 files changed, 15 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 4030492c712..3e05ababb8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Mon Aug 23 16:33:59 2004 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * ace/config-netbsd.h:
+
+ Remove PACKAGE, PACKAGE_*, and VERSION definitions. The latter
+ conflicts with some of the test/example programs. I'll get rid
+ of the others just to be safe.
+
+ Comment out ACE_NTRACE, as the constant definition conflicts
+ with Misc_test_trace. We probably need an option to control
+ whether tracing and debugging features are enabled when ACE/
+ TAO is compiled that is separate from the one used after it
+ has been built.
+
Mon Aug 23 16:06:39 2004 J.T. Conklin <jtc@acorntoolworks.com>
* configure.ac:
diff --git a/ace/config-netbsd.h b/ace/config-netbsd.h
index a598fe5728b..394788942fc 100644
--- a/ace/config-netbsd.h
+++ b/ace/config-netbsd.h
@@ -1386,7 +1386,7 @@
/* #undef ACE_NO_INLINE */
/* Turns off the tracing feature. */
-#define ACE_NTRACE 1
+/* #define ACE_NTRACE 1 */
/* Defines the page size of the system (not used on Win32 or with
ACE_HAS_GETPAGESIZE). */
@@ -1639,24 +1639,6 @@
/* Configure for use on Irix 6 */
/* #undef IRIX6 */
-/* Name of package */
-#define PACKAGE "ace"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "ace-bugs@cs.wustl.edu"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "ACE"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ACE 5.4.2"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "ace"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "5.4.2"
-
/* Maximum thread priority */
/* #undef PTHREAD_MAX_PRIORITY */
@@ -1725,9 +1707,6 @@
/* */
/* #undef UNIXWARE_7_1 */
-/* Version number of package */
-#define VERSION "5.4.2"
-
/* Configure for use on VxWorks */
/* #undef VXWORKS */