diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-11 15:10:26 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-11 15:10:26 +0000 |
| commit | d99c6f0cbc3485eb99c90fe7a2d13a17b5f0125e (patch) | |
| tree | d58ea1e3e97f8e16708e0e7ae5f2482619316f46 | |
| parent | 1b61526a91771a76d830847873f62fb5604dd7f4 (diff) | |
make latest header file changes for this file too
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@33482 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | res/snmp/agent.c | 18 |
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" |