Fix illegal identifiers: Names starting with __ or _ and uppercase are reserved

for the system, names starting with _ are reserved at file level.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25635 b3059339-0415-0410-9bf9-f77b7e298cf2

16 files changed, 33 insertions, 33 deletions

diff --git a/asxparser.h b/asxparser.h
index cc3c6eeb16..e6bad13851 100644
--- a/asxparser.h
+++ b/asxparser.h
@@ -1,14 +1,14 @@
 #ifndef ASXPARSER_H
 #define ASXPARSER_H
 
-typedef struct _ASX_Parser_t ASX_Parser_t;
+typedef struct ASX_Parser_t ASX_Parser_t;
 
 typedef struct {
   char* buffer;
   int line;
 } ASX_LineSave_t;
 
-struct _ASX_Parser_t {
+struct ASX_Parser_t {
   int line; // Curent line
   ASX_LineSave_t *ret_stack;
   int ret_stack_size;
diff --git a/drivers/generic_math.h b/drivers/generic_math.h
index b5638eb02d..dfbc3baff7 100644
--- a/drivers/generic_math.h
+++ b/drivers/generic_math.h
@@ -8,7 +8,7 @@
 #ifndef GENERIC_MATH_H
 #define GENERIC_MATH_H
 
-typedef struct _gen_sincos
+typedef struct gen_sincos
 {
   double x;
   double sinx;
diff --git a/gui/bitmap.h b/gui/bitmap.h
index 0e5a455ac5..06194514e0 100644
--- a/gui/bitmap.h
+++ b/gui/bitmap.h
@@ -1,7 +1,7 @@
 #ifndef GUI_BITMAP_H
 #define GUI_BITMAP_H
 
-typedef struct _txSample
+typedef struct txSample
 {
  unsigned long Width;
  unsigned long Height;
diff --git a/gui/interface.h b/gui/interface.h
index ad073a7333..1217d1e479 100644
--- a/gui/interface.h
+++ b/gui/interface.h
@@ -153,17 +153,17 @@ extern void guiLoadFont( void );
 extern void guiLoadSubtitle( char * name );
 extern void guiMessageBox(int level, char * str);
 
-typedef struct _plItem 
+typedef struct plItem
 {
- struct _plItem * prev,* next;
+ struct plItem * prev,* next;
  int       played;
  char    * path;
  char    * name;
 } plItem;
 
-typedef struct _urlItem
+typedef struct urlItem
 {
- struct _urlItem *next;
+ struct urlItem *next;
  char    * url;
 } URLItem;
 
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c
index 7a96b5de0c..dadfb748d9 100644
--- a/libmpcodecs/ve_x264.c
+++ b/libmpcodecs/ve_x264.c
@@ -48,7 +48,7 @@
 
 #include <x264.h>
 
-typedef struct _h264_module_t {
+typedef struct h264_module_t {
     muxer_stream_t *mux;
     x264_t *    x264;
     x264_picture_t  pic;
diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c
index d764412f7d..0ccf72102f 100644
--- a/libmpcodecs/ve_xvid4.c
+++ b/libmpcodecs/ve_xvid4.c
@@ -319,7 +319,7 @@ m_option_t xvidencopts_conf[] =
  * Module private data
  ****************************************************************************/
 
-typedef struct _xvid_mplayer_module_t
+typedef struct xvid_mplayer_module_t
 {
 	/* Instance related global vars */
 	void *instance;
diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h
index 7a2f96c124..581e1c9b39 100644
--- a/libmpdemux/aviheader.h
+++ b/libmpdemux/aviheader.h
@@ -120,19 +120,19 @@ typedef struct
 } AVIINDEXENTRY;
 
 
-typedef struct _avisuperindex_entry {
+typedef struct avisuperindex_entry {
     uint64_t qwOffset;           // absolute file offset
     uint32_t dwSize;             // size of index chunk at this offset
     uint32_t dwDuration;         // time span in stream ticks
 } avisuperindex_entry;
 
-typedef struct _avistdindex_entry {
+typedef struct avistdindex_entry {
     uint32_t dwOffset;           // qwBaseOffset + this is absolute file offset
     uint32_t dwSize;             // bit 31 is set if this is NOT a keyframe
 } avistdindex_entry;
 
 // Standard index 
-typedef struct __attribute__((packed)) _avistdindex_chunk {
+typedef struct __attribute__((packed)) avistdindex_chunk {
     char           fcc[4];       // ix##
     uint32_t  dwSize;            // size of this chunk
     uint16_t wLongsPerEntry;     // must be sizeof(aIndex[0])/sizeof(DWORD)
@@ -147,7 +147,7 @@ typedef struct __attribute__((packed)) _avistdindex_chunk {
     
 
 // Base Index Form 'indx'
-typedef struct _avisuperindex_chunk {
+typedef struct avisuperindex_chunk {
     char           fcc[4];
     uint32_t  dwSize;                // size of this chunk
     uint16_t wLongsPerEntry;         // size of each entry in aIndex array (must be 4*4 for us)
diff --git a/libmpdemux/demux_film.c b/libmpdemux/demux_film.c
index be2c5ab43b..fe2c287001 100644
--- a/libmpdemux/demux_film.c
+++ b/libmpdemux/demux_film.c
@@ -27,7 +27,7 @@
 #define CHUNK_FDSC mmioFOURCC('F', 'D', 'S', 'C')
 #define CHUNK_STAB mmioFOURCC('S', 'T', 'A', 'B')
 
-typedef struct _film_chunk_t
+typedef struct film_chunk_t
 {
   off_t chunk_offset;
   int chunk_size;
@@ -37,7 +37,7 @@ typedef struct _film_chunk_t
   float pts;
 } film_chunk_t;
 
-typedef struct _film_data_t
+typedef struct film_data_t
 {
   unsigned int total_chunks;
   unsigned int current_chunk;
diff --git a/libmpdemux/demux_lmlm4.c b/libmpdemux/demux_lmlm4.c
index 9ae76d3da4..84bca8731d 100644
--- a/libmpdemux/demux_lmlm4.c
+++ b/libmpdemux/demux_lmlm4.c
@@ -17,7 +17,7 @@
 #include "demuxer.h"
 #include "stheader.h"
 
-typedef struct __FrameInfo
+typedef struct FrameInfo
 {
     ssize_t frameSize;
     ssize_t paddingSize;
diff --git a/libmpdemux/demux_nuv.c b/libmpdemux/demux_nuv.c
index b9cfdd0782..5e33412d93 100644
--- a/libmpdemux/demux_nuv.c
+++ b/libmpdemux/demux_nuv.c
@@ -25,9 +25,9 @@ struct nuv_signature
 	char version[5];    /* "0.05" + \0 */
 };
 
-typedef struct _nuv_position_t nuv_position_t;
+typedef struct nuv_position_t nuv_position_t;
 
-struct _nuv_position_t 
+struct nuv_position_t
 {
 	off_t offset;
 	float time;
@@ -35,7 +35,7 @@ struct _nuv_position_t
 	nuv_position_t* next;
 };
 
-typedef struct _nuv_info_t 
+typedef struct nuv_info_t
 {
 	int current_audio_frame;
 	int current_video_frame;
diff --git a/libmpdemux/demux_xmms_plugin.h b/libmpdemux/demux_xmms_plugin.h
index c2b1b8351c..5aa176f952 100644
--- a/libmpdemux/demux_xmms_plugin.h
+++ b/libmpdemux/demux_xmms_plugin.h
@@ -133,7 +133,7 @@ typedef struct
 }
 GeneralPlugin;
 
-typedef struct _VisPlugin
+typedef struct VisPlugin
 {
 	void *handle; 	/* Filled in by xmms */
 	char *filename; /* Filled in by xmms */
@@ -145,7 +145,7 @@ typedef struct _VisPlugin
 	void (*cleanup)(void); /* Called when the plugin is disabled */
 	void (*about)(void); /* Show the about box */
 	void (*configure)(void); /* Show the configure box */
-	void (*disable_plugin)(struct _VisPlugin *); /* Call this with a pointer to your plugin to disable the plugin */
+	void (*disable_plugin)(struct VisPlugin *); /* Call this with a pointer to your plugin to disable the plugin */
 	void (*playback_start)(void); /* Called when playback starts */
 	void (*playback_stop)(void); /* Called when playback stops */
 	void (*render_pcm)(short pcm_data[2][512]); /* Render the PCM data, don't do anything time consuming in here */
diff --git a/libmpdemux/yuv4mpeg.h b/libmpdemux/yuv4mpeg.h
index 2db6136ce1..157d426c0e 100644
--- a/libmpdemux/yuv4mpeg.h
+++ b/libmpdemux/yuv4mpeg.h
@@ -55,7 +55,7 @@
  *  'ratio' datatype, for rational numbers
  *                                     (see 'ratio' functions down below)
  ************************************************************************/
-typedef struct _y4m_ratio {
+typedef struct y4m_ratio {
   int n;  /* numerator   */
   int d;  /* denominator */
 } y4m_ratio_t;
@@ -99,7 +99,7 @@ extern const y4m_ratio_t y4m_sar_PAL_SVCD_16_9; /* PAL SVCD 16:9           */
  ************************************************************************/
 #define Y4M_MAX_XTAGS 32        /* maximum number of xtags in list       */
 #define Y4M_MAX_XTAG_SIZE 32    /* max length of an xtag (including 'X') */
-typedef struct _y4m_xtag_list {
+typedef struct y4m_xtag_list {
   int count;
   char *tags[Y4M_MAX_XTAGS];
 } y4m_xtag_list_t;
@@ -114,7 +114,7 @@ typedef struct _y4m_xtag_list {
  *     Use the y4m_si_*() functions (see below).
  *     You must initialize/finalize this structure before/after use.
  ************************************************************************/
-typedef struct _y4m_stream_info {
+typedef struct y4m_stream_info {
   /* values from header */
   int width;
   int height;
@@ -141,7 +141,7 @@ typedef struct _y4m_stream_info {
  *     Use the y4m_fi_*() functions (see below).
  *     You must initialize/finalize this structure before/after use.
  ************************************************************************/
-typedef struct _y4m_frame_info {
+typedef struct y4m_frame_info {
   /* mystical X tags */
   y4m_xtag_list_t x_tags;
 } y4m_frame_info_t;
diff --git a/stream/tvi_dshow.h b/stream/tvi_dshow.h
index ee75c11d40..d5047ef361 100644
--- a/stream/tvi_dshow.h
+++ b/stream/tvi_dshow.h
@@ -116,7 +116,7 @@ typedef enum tagPhysicalConnectorType { PhysConn_Video_Tuner = 1,
     PhysConn_Audio_AudioDecoder = PhysConn_Audio_USB + 1
 } PhysicalConnectorType;
 
-typedef struct _VIDEO_STREAM_CONFIG_CAPS {
+typedef struct VIDEO_STREAM_CONFIG_CAPS {
     GUID guid;			// will be MEDIATYPE_Video
     ULONG VideoStandard;	// logical OR of all AnalogVideoStandards
     // supported
@@ -142,7 +142,7 @@ typedef struct _VIDEO_STREAM_CONFIG_CAPS {
     LONG MaxBitsPerSecond;
 } VIDEO_STREAM_CONFIG_CAPS, *PVIDEO_STREAM_CONFIG_CAPS;
 
-typedef struct _AUDIO_STREAM_CONFIG_CAPS {
+typedef struct AUDIO_STREAM_CONFIG_CAPS {
     GUID guid;
     ULONG MinimumChannels;
     ULONG MaximumChannels;
@@ -238,12 +238,12 @@ typedef enum tagTVAudioMode {
     AMTVAUDIO_MODE_LANG_C = 0x0040,
 } TVAudioMode;
 
-typedef struct _FilterInfo {
+typedef struct FilterInfo {
     WCHAR achName[128];
     LPFILTERGRAPH pGraph;
 } FILTER_INFO;
 
-typedef struct _PinInfo {
+typedef struct PinInfo {
     LPBASEFILTER pFilter;
     PIN_DIRECTION dir;
     unsigned short achName[128];
diff --git a/subreader.c b/subreader.c
index 2381b76d1a..56a7ef7d1b 100644
--- a/subreader.c
+++ b/subreader.c
@@ -1781,7 +1781,7 @@ static int whiteonly(char *s)
     return 1;
 }
 
-typedef struct _subfn 
+typedef struct subfn
 {
     int priority;
     char *fname;
diff --git a/vidix/sysdep/libdha_win32.c b/vidix/sysdep/libdha_win32.c
index 0a151b0637..c4fece4c19 100644
--- a/vidix/sysdep/libdha_win32.c
+++ b/vidix/sysdep/libdha_win32.c
@@ -13,7 +13,7 @@
   to request services from the MAPDEV VxD.
 */
 
-typedef struct _MapDevRequest
+typedef struct MapDevRequest
 {
 	DWORD	mdr_ServiceID;		/* supplied by caller */
 	LPVOID	mdr_PhysicalAddress;	/* supplied by caller */
diff --git a/xvid_vbr.h b/xvid_vbr.h
index 3d198b96a1..552d9935bf 100644
--- a/xvid_vbr.h
+++ b/xvid_vbr.h
@@ -58,7 +58,7 @@ typedef vbr_finish_function *vbr_finish_function_ptr;
  * The VBR CONTROLER structure - the spin of the library
  *****************************************************************************/
 
-typedef struct _vbr_control_t
+typedef struct vbr_control_t
 {
 
 	/* All modes - specifies what VBR algorithm has to be used */