[Freeswitch-svn] [commit] r13665 - freeswitch/trunk/src/include

[FreeSWITCH SVN]

Author: mrene
Date: Sat Jun  6 14:10:37 2009
New Revision: 13665

Log:
xml_config tweaks

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Sat Jun  6 14:10:37 2009
@@ -98,11 +98,32 @@
 	char *helptext;							/*< Optional documentation text for this setting */
 };
 
-#define SWITCH_CONFIG_ITEM(_key, _type, _flags, _ptr, _defaultvalue, _data, _syntax, _helptext)	{ _key, _type, _flags, _ptr, _defaultvalue, _data, NULL, _syntax, _helptext }
-#define SWITCH_CONFIG_ITEM_STRING_STRDUP(_key, _flags, _ptr, _defaultvalue, _syntax, _helptext)	{ _key, SWITCH_CONFIG_STRING, _flags, _ptr, _defaultvalue, &switch_config_string_strdup, NULL, _helptext}
-#define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _flags, _ptr, _defaultvalue, _data, _functiondata, _syntax, _helptext)	{ _key, _type, _flags, _ptr, _defaultvalue, _functiondata, _data, _syntax, _helptext }
+#define SWITCH_CONFIG_ITEM(_key, _type, _flags, _ptr, _defaultvalue, _data, _syntax, _helptext)	{ _key, _type, _flags, _ptr, (void*)_defaultvalue, (void*)_data, NULL, _syntax, _helptext }
+#define SWITCH_CONFIG_ITEM_STRING_STRDUP(_key, _flags, _ptr, _defaultvalue, _syntax, _helptext)	{ _key, SWITCH_CONFIG_STRING, _flags, _ptr, (void*)_defaultvalue, &switch_config_string_strdup, NULL, _syntax, _helptext }
+#define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _flags, _ptr, _defaultvalue, _function, _functiondata, _syntax, _helptext)	{ _key, _type, _flags, _ptr, (void*)_defaultvalue, _functiondata, _function, _syntax, _helptext }
 #define SWITCH_CONFIG_ITEM_END() { NULL, SWITCH_CONFIG_LAST, 0, NULL, NULL, NULL, NULL, NULL, NULL }
 
+#define SWITCH_CONFIG_SET_ITEM(_item, _key, _type, _flags, _ptr, _defaultvalue, _data, _syntax, _helptext)  \
+	_item.key = _key; \
+	_item.type = _type; \
+	_item.flags = _flags; \
+	_item.ptr = _ptr; \
+	_item.defaultvalue = (void*)_defaultvalue; \
+	_item.data = (void*)_data; \
+	_item.syntax = _syntax; \
+	_item.helptext = _helptext
+
+#define SWITCH_CONFIG_SET_ITEM_CALLBACK(_item, _key, _type, _flags, _ptr, _defaultvalue, _function, _syntax, _helptext)  \
+	_item.key = _key; \
+	_item.type = _type; \
+	_item.flags = _flags; \
+	_item.ptr = ptr; \
+	_item.defaultvalue = (void*)_defaultvalue; \
+	_item.data = (void*)_data; \
+	_item.function = _function \
+	_item.syntax = _syntax; \
+	_item.helptext = _helptext
+
 /*! 
  * \brief Gets the int representation of an enum
  * \param enum_options the switch_xml_config_enum_item_t array for this enum