[asterisk-dev] asterisk-addons broken

[Trevor G. Hammonds]

I updated to the latest SVN Trunk this morning, and am no longer able to
compile asterisk-addons.  

Any ideas or suggestions as to a quick workaround?  I really like using
cdr_addon_mysql...

		Sincerely,
		Trevor Hammonds

 
# make
./mkdep -fPIC -I../asterisk -D_GNU_SOURCE -DMYSQL_LOGUNIQUEID
-I/usr/include/mysql   `ls *.c`
cc -fPIC -I../asterisk -D_GNU_SOURCE -DMYSQL_LOGUNIQUEID
-I/usr/include/mysql     -c -o cdr_addon_mysql.o cdr_addon_mysql.c
cdr_addon_mysql.c:239: error: conflicting types for 'description'
/usr/include/asterisk/module.h:85: error: previous declaration of
'description' was here
cdr_addon_mysql.c:239: error: conflicting types for 'description'
/usr/include/asterisk/module.h:85: error: previous declaration of
'description' was here
cdr_addon_mysql.c:491: error: conflicting types for 'key'
/usr/include/asterisk/module.h:102: error: previous declaration of 'key' was
here
cdr_addon_mysql.c:491: error: conflicting types for 'key'
/usr/include/asterisk/module.h:102: error: previous declaration of 'key' was
here
make: *** [cdr_addon_mysql.o] Error 1