diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-24 19:43:31 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-24 19:43:31 +0000 |
| commit | 41af2260b79cbef918e170240ece6fd38962011c (patch) | |
| tree | c9ee092b1529897cefb9171ca38ad1c5f74d293a /include | |
| parent | 3df43d0174f5ed6d1521ddc2f0d460d690fcd19b (diff) | |
The Eurostar Commit! (it's amazing how much work you can get done on a 150 minute train ride from Paris to London <G>)
support the new location for zaptel.h and tonezone.h
use the dependency information output by menuselect to build Makefile rules for each module for header files and libraries
combine the common rules into a top-level Makefile.rules file
remove all (now) unnecessary stuff from subdir Makefiles
change translator API so that the newpvt() callback returns an int instead of a pointer (it no longer allocates memory)
alphabetize --with-<foo> options in configure script
enhance Net-SNMP support in configure script to provide a --with-netsnmp option
fix support for --with-pq so that if pg-config is not found when --with-pq is specified, an error will be generated
add 'optional package' usage to modules now that menuselect can output it
allow res_snmp to build by default, since the new loader changes coming soon will solve the function naming problem (and users can disable it via menuselect anyway)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@35832 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 3 | ||||
| -rw-r--r-- | include/asterisk/translate.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index a0cf4bc9e..fd441011a 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -200,6 +200,9 @@ /* Define to 1 if you have the <netinet/in.h> header file. */ #undef HAVE_NETINET_IN_H +/* Define to indicate the Net-SNMP library */ +#undef HAVE_NETSNMP + /* Define to indicate the newt library */ #undef HAVE_NEWT diff --git a/include/asterisk/translate.h b/include/asterisk/translate.h index 29c3fd56c..ed6f6275b 100644 --- a/include/asterisk/translate.h +++ b/include/asterisk/translate.h @@ -72,7 +72,7 @@ struct ast_translator { int dstfmt; /*!< Destination format (note: bit position, converted to index during registration) */ - void *(*newpvt)(struct ast_trans_pvt *); /*!< initialize private data + int (*newpvt)(struct ast_trans_pvt *); /*!< initialize private data associated with the translator */ int (*framein)(struct ast_trans_pvt *pvt, struct ast_frame *in); |