From: Kevin P. Fleming <kpfleming@digium.com>
Date: Sun, 11 Jun 2006 15:10:26 +0000 (+0000)
Subject: make latest header file changes for this file too
X-Git-Tag: 1.4.0-beta1~939
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3ddee7d7f34f7a4857aa6bba9760f7c4db465c2;p=thirdparty%2Fasterisk.git

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
---

diff --git a/res/snmp/agent.c b/res/snmp/agent.c
index cb089c0074..a7ef950c7a 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"