[asterisk-commits] rizzo: trunk r93875 - /trunk/res/snmp/agent.c

[SVN commits to the Asterisk project]

Author: rizzo
Date: Wed Dec 19 02:12:33 2007
New Revision: 93875

URL: http://svn.digium.com/view/asterisk?view=rev&rev=93875
Log:
make netsmp build under AST_DEVMODE. Description, included in the source,
is below. I should note that the PACKAGE_* macros that asterisk
defines in autoconfig.h are not used anywhere in the tree so
they should just be removed.

 /*
  * There is some collision collision between netsmp and asterisk names,
  * causing build under AST_DEVMODE to fail.
  *
  * The following PACKAGE_* macros are one place.
  * Also netsnmp has an improper check for HAVE_DMALLOC_H, using
  *    #if HAVE_DMALLOC_H   instead of #ifdef HAVE_DMALLOC_H
  * As a countermeasure we define it to 0, however this will fail
  * when the proper check is implemented.
  */

No

Modified:
    trunk/res/snmp/agent.c

Modified: trunk/res/snmp/agent.c
URL: http://svn.digium.com/view/asterisk/trunk/res/snmp/agent.c?view=diff&rev=93875&r1=93874&r2=93875
==============================================================================
--- trunk/res/snmp/agent.c (original)
+++ trunk/res/snmp/agent.c Wed Dec 19 02:12:33 2007
@@ -17,6 +17,35 @@
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+/*
+ * There is some collision collision between netsmp and asterisk names,
+ * causing build under AST_DEVMODE to fail.
+ *
+ * The following PACKAGE_* macros are one place.
+ * Also netsnmp has an improper check for HAVE_DMALLOC_H, using
+ *    #if HAVE_DMALLOC_H   instead of #ifdef HAVE_DMALLOC_H
+ * As a countermeasure we define it to 0, however this will fail
+ * when the proper check is implemented.
+ */
+#ifdef PACKAGE_NAME
+#undef PACKAGE_NAME
+#endif
+#ifdef PACKAGE_BUGREPORT
+#undef PACKAGE_BUGREPORT
+#endif
+#ifdef PACKAGE_STRING
+#undef PACKAGE_STRING
+#endif
+#ifdef PACKAGE_TARNAME
+#undef PACKAGE_TARNAME
+#endif
+#ifdef PACKAGE_VERSION
+#undef PACKAGE_VERSION
+#endif
+#ifndef HAVE_DMALLOC_H
+#define HAVE_DMALLOC_H 0	/* XXX we shouldn't do this */
+#endif
 
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>