diff -r 567bb019e3e3 -r 7e817e7e631c gstreamer_core/gst/gstenumtypes.h
--- a/gstreamer_core/gst/gstenumtypes.h	Tue Aug 31 15:30:33 2010 +0300
+++ b/gstreamer_core/gst/gstenumtypes.h	Wed Sep 01 12:16:41 2010 +0100
@@ -31,21 +31,9 @@
 
 GType gst_buffer_flag_get_type (void);
 #define GST_TYPE_BUFFER_FLAG (gst_buffer_flag_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_buffer_copy_flags_get_type (void);
 #define GST_TYPE_BUFFER_COPY_FLAGS (gst_buffer_copy_flags_get_type())
 
-/* enumerations from "gstbufferlist.h" */
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-GType gst_buffer_list_item_get_type (void);
-#define GST_TYPE_BUFFER_LIST_ITEM (gst_buffer_list_item_get_type())
-
 /* enumerations from "gstbus.h" */
 #ifdef __SYMBIAN32__
 IMPORT_C
@@ -53,10 +41,6 @@
 
 GType gst_bus_flags_get_type (void);
 #define GST_TYPE_BUS_FLAGS (gst_bus_flags_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_bus_sync_reply_get_type (void);
 #define GST_TYPE_BUS_SYNC_REPLY (gst_bus_sync_reply_get_type())
 
@@ -75,16 +59,8 @@
 
 GType gst_clock_return_get_type (void);
 #define GST_TYPE_CLOCK_RETURN (gst_clock_return_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_clock_entry_type_get_type (void);
 #define GST_TYPE_CLOCK_ENTRY_TYPE (gst_clock_entry_type_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_clock_flags_get_type (void);
 #define GST_TYPE_CLOCK_FLAGS (gst_clock_flags_get_type())
 
@@ -103,22 +79,10 @@
 
 GType gst_state_get_type (void);
 #define GST_TYPE_STATE (gst_state_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_state_change_return_get_type (void);
 #define GST_TYPE_STATE_CHANGE_RETURN (gst_state_change_return_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_state_change_get_type (void);
 #define GST_TYPE_STATE_CHANGE (gst_state_change_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_element_flags_get_type (void);
 #define GST_TYPE_ELEMENT_FLAGS (gst_element_flags_get_type())
 
@@ -129,22 +93,10 @@
 
 GType gst_core_error_get_type (void);
 #define GST_TYPE_CORE_ERROR (gst_core_error_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_library_error_get_type (void);
 #define GST_TYPE_LIBRARY_ERROR (gst_library_error_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_resource_error_get_type (void);
 #define GST_TYPE_RESOURCE_ERROR (gst_resource_error_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_stream_error_get_type (void);
 #define GST_TYPE_STREAM_ERROR (gst_stream_error_get_type())
 
@@ -155,19 +107,10 @@
 
 GType gst_event_type_flags_get_type (void);
 #define GST_TYPE_EVENT_TYPE_FLAGS (gst_event_type_flags_get_type())
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_event_type_get_type (void);
 #define GST_TYPE_EVENT_TYPE (gst_event_type_get_type())
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_seek_type_get_type (void);
 #define GST_TYPE_SEEK_TYPE (gst_seek_type_get_type())
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_seek_flags_get_type (void);
 #define GST_TYPE_SEEK_FLAGS (gst_seek_flags_get_type())
 
@@ -186,29 +129,14 @@
 
 GType gst_index_certainty_get_type (void);
 #define GST_TYPE_INDEX_CERTAINTY (gst_index_certainty_get_type())
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_index_entry_type_get_type (void);
 #define GST_TYPE_INDEX_ENTRY_TYPE (gst_index_entry_type_get_type())
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_index_lookup_method_get_type (void);
 #define GST_TYPE_INDEX_LOOKUP_METHOD (gst_index_lookup_method_get_type())
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_assoc_flags_get_type (void);
 #define GST_TYPE_ASSOC_FLAGS (gst_assoc_flags_get_type())
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_index_resolver_method_get_type (void);
 #define GST_TYPE_INDEX_RESOLVER_METHOD (gst_index_resolver_method_get_type())
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_index_flags_get_type (void);
 #define GST_TYPE_INDEX_FLAGS (gst_index_flags_get_type())
 
@@ -219,9 +147,6 @@
 
 GType gst_debug_level_get_type (void);
 #define GST_TYPE_DEBUG_LEVEL (gst_debug_level_get_type())
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_debug_color_flags_get_type (void);
 #define GST_TYPE_DEBUG_COLOR_FLAGS (gst_debug_color_flags_get_type())
 
@@ -232,9 +157,6 @@
 
 GType gst_iterator_result_get_type (void);
 #define GST_TYPE_ITERATOR_RESULT (gst_iterator_result_get_type())
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_iterator_item_get_type (void);
 #define GST_TYPE_ITERATOR_ITEM (gst_iterator_item_get_type())
 
@@ -245,17 +167,6 @@
 
 GType gst_message_type_get_type (void);
 #define GST_TYPE_MESSAGE_TYPE (gst_message_type_get_type())
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-GType gst_structure_change_type_get_type (void);
-#define GST_TYPE_STRUCTURE_CHANGE_TYPE (gst_structure_change_type_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-GType gst_stream_status_type_get_type (void);
-#define GST_TYPE_STREAM_STATUS_TYPE (gst_stream_status_type_get_type())
 
 /* enumerations from "gstminiobject.h" */
 #ifdef __SYMBIAN32__
@@ -272,27 +183,12 @@
 
 GType gst_pad_link_return_get_type (void);
 #define GST_TYPE_PAD_LINK_RETURN (gst_pad_link_return_get_type())
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_flow_return_get_type (void);
 #define GST_TYPE_FLOW_RETURN (gst_flow_return_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_activate_mode_get_type (void);
 #define GST_TYPE_ACTIVATE_MODE (gst_activate_mode_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_pad_direction_get_type (void);
 #define GST_TYPE_PAD_DIRECTION (gst_pad_direction_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_pad_flags_get_type (void);
 #define GST_TYPE_PAD_FLAGS (gst_pad_flags_get_type())
 
@@ -303,10 +199,6 @@
 
 GType gst_pad_presence_get_type (void);
 #define GST_TYPE_PAD_PRESENCE (gst_pad_presence_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_pad_template_flags_get_type (void);
 #define GST_TYPE_PAD_TEMPLATE_FLAGS (gst_pad_template_flags_get_type())
 
@@ -325,19 +217,9 @@
 
 GType gst_plugin_error_get_type (void);
 #define GST_TYPE_PLUGIN_ERROR (gst_plugin_error_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_plugin_flags_get_type (void);
 #define GST_TYPE_PLUGIN_FLAGS (gst_plugin_flags_get_type())
 
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-GType gst_plugin_dependency_flags_get_type (void);
-#define GST_TYPE_PLUGIN_DEPENDENCY_FLAGS (gst_plugin_dependency_flags_get_type())
-
 /* enumerations from "gstpluginfeature.h" */
 #ifdef __SYMBIAN32__
 IMPORT_C
@@ -354,20 +236,6 @@
 GType gst_query_type_get_type (void);
 #define GST_TYPE_QUERY_TYPE (gst_query_type_get_type())
 
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-GType gst_buffering_mode_get_type (void);
-#define GST_TYPE_BUFFERING_MODE (gst_buffering_mode_get_type())
-
-/* enumerations from "gstsystemclock.h" */
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-GType gst_clock_type_get_type (void);
-#define GST_TYPE_CLOCK_TYPE (gst_clock_type_get_type())
-
 /* enumerations from "gsttaglist.h" */
 #ifdef __SYMBIAN32__
 IMPORT_C
@@ -375,10 +243,6 @@
 
 GType gst_tag_merge_mode_get_type (void);
 #define GST_TYPE_TAG_MERGE_MODE (gst_tag_merge_mode_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 GType gst_tag_flag_get_type (void);
 #define GST_TYPE_TAG_FLAG (gst_tag_flag_get_type())
 
@@ -414,14 +278,6 @@
 GType gst_uri_type_get_type (void);
 #define GST_TYPE_URI_TYPE (gst_uri_type_get_type())
 
-/* enumerations from "gstutils.h" */
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-GType gst_search_mode_get_type (void);
-#define GST_TYPE_SEARCH_MODE (gst_search_mode_get_type())
-
 /* enumerations from "gstparse.h" */
 #ifdef __SYMBIAN32__
 IMPORT_C
@@ -429,12 +285,6 @@
 
 GType gst_parse_error_get_type (void);
 #define GST_TYPE_PARSE_ERROR (gst_parse_error_get_type())
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-GType gst_parse_flags_get_type (void);
-#define GST_TYPE_PARSE_FLAGS (gst_parse_flags_get_type())
 G_END_DECLS
 
 #endif /* __GST_ENUM_TYPES_H__ */