summaryrefslogtreecommitdiff
path: root/res/snmp
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-06-11 15:10:26 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-06-11 15:10:26 +0000
commite3ddee7d7f34f7a4857aa6bba9760f7c4db465c2 (patch)
treed58ea1e3e97f8e16708e0e7ae5f2482619316f46 /res/snmp
parent7100403fd90cdbc06be4fd46c172caf94d25ea41 (diff)
make latest header file changes for this file too
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33482 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/snmp')
-rw-r--r--res/snmp/agent.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/res/snmp/agent.c b/res/snmp/agent.c
index cb089c007..a7ef950c7 100644
--- a/res/snmp/agent.c
+++ b/res/snmp/agent.c
@@ -14,24 +14,14 @@
* \author Thorsten Lockert <tholo@voop.as>
*/
-#include <net-snmp/net-snmp-config.h>
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-
-/*
- * These conflict with ones in Asterisk header files, so
- * get rid of them. They'll be back after the next few
- * includes...
- */
-#undef HAVE_GETLOADAVG
-#undef HAVE_STRCASESTR
-
-#include <pthread.h>
-
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include <net-snmp/net-snmp-config.h>
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+
#include "asterisk/channel.h"
#include "asterisk/logger.h"
#include "asterisk/options.h"