fix illegal identifiers in multiple inclusion guards

patch by Diego Biurrun % diego A biurrun P de %

diff --git a/common/bs.h b/common/bs.h
index fa4002ddae962cc0982fdc40f7ab8f8f392e7490..22f5347431b274029663e2edd993be75ab425d5a 100644 (file)
--- a/common/bs.h
+++ b/common/bs.h
@@ -21,10 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifdef _BS_H
-#warning FIXME Multiple inclusion of bs.h
-#else
-#define _BS_H
+#ifndef X264_BS_H
+#define X264_BS_H
 
 typedef struct bs_s
 {

diff --git a/common/cabac.h b/common/cabac.h
index 091992fdabb8c0ca9933d6abd4569a9dbcec39aa..bfdc5b3fdf110b358534fb0d379609edf1cd7206 100644 (file)
--- a/common/cabac.h
+++ b/common/cabac.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _CABAC_H
-#define _CABAC_H 1
+#ifndef X264_CABAC_H
+#define X264_CABAC_H
 
 typedef struct
 {

diff --git a/common/common.h b/common/common.h
index b9f4869fa789ea1bde646d2ba63bbe9745aeecc2..5adcefcc808357cfafa9a793be3b07cc88f67999 100644 (file)
--- a/common/common.h
+++ b/common/common.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _COMMON_H
-#define _COMMON_H 1
+#ifndef X264_COMMON_H
+#define X264_COMMON_H
 
 /****************************************************************************
  * Macros

diff --git a/common/cpu.h b/common/cpu.h
index 3be940b5136784fcd786d2f76e2698e1e7f2d979..e78148ade8b83baa60af48bbfd792695a6f6fe19 100644 (file)
--- a/common/cpu.h
+++ b/common/cpu.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _CPU_H
-#define _CPU_H 1
+#ifndef X264_CPU_H
+#define X264_CPU_H
 
 uint32_t x264_cpu_detect( void );
 int      x264_cpu_num_processors( void );

diff --git a/common/dct.h b/common/dct.h
index 38aa0788c2184c2c4c6ffe65fb74033cd5a667ff..ee9d7d1ec38189b60ea11bd2e6e29b1fcc8ae207 100644 (file)
--- a/common/dct.h
+++ b/common/dct.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _DCT_H
-#define _DCT_H 1
+#ifndef X264_DCT_H
+#define X264_DCT_H
 
 /* the inverse of the scaling factors introduced by 8x8 fdct */
 #define W(i) (i==0 ? FIX8(1.0000) :\

diff --git a/common/display.h b/common/display.h
index 6f2db0c7a4473512ad7a23f11ebb6ff089544aef..31dcc28987406d30c48db91da9ad4c36b4c0c359 100644 (file)
--- a/common/display.h
+++ b/common/display.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _DISPLAY_H
-#define _DISPLAY_H 1
+#ifndef X264_DISPLAY_H
+#define X264_DISPLAY_H
 
 void disp_sync(void);
 void disp_setcolor(unsigned char *name);

diff --git a/common/frame.h b/common/frame.h
index 6c8f991d8cea9eb0d87cff74f0f8709550083ad7..1cd7b645a0c0941d9c964ab429bc44e53e6bdee9 100644 (file)
--- a/common/frame.h
+++ b/common/frame.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _FRAME_H
-#define _FRAME_H 1
+#ifndef X264_FRAME_H
+#define X264_FRAME_H
 
 /* number of pixels past the edge of the frame, for motion estimation/compensation */
 #define PADH 32

diff --git a/common/macroblock.h b/common/macroblock.h
index 442ce2a751b0a304c3f43b092334c5d131e9e894..e127e2b7cf2a8e04ccdc95cbf0f8630df2dca11c 100644 (file)
--- a/common/macroblock.h
+++ b/common/macroblock.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _MACROBLOCK_H
-#define _MACROBLOCK_H 1
+#ifndef X264_MACROBLOCK_H
+#define X264_MACROBLOCK_H
 
 enum macroblock_position_e
 {

diff --git a/common/mc.h b/common/mc.h
index b2f5ed28b76b9630339524a3e825dacf06d2aad6..83b3e90747bdc068dc0eb61e7d6c12441bc48a50 100644 (file)
--- a/common/mc.h
+++ b/common/mc.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _MC_H
-#define _MC_H 1
+#ifndef X264_MC_H
+#define X264_MC_H
 
 /* Do the MC
  * XXX: Only width = 4, 8 or 16 are valid

diff --git a/common/osdep.h b/common/osdep.h
index 98170728a83d3b33e54e244c8c9e3f3898534f6b..d914e78472a57a0b208f41edbbb5793bab01e0da 100644 (file)
--- a/common/osdep.h
+++ b/common/osdep.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _OSDEP_H
-#define _OSDEP_H
+#ifndef X264_OSDEP_H
+#define X264_OSDEP_H
 
 #define _LARGEFILE_SOURCE 1
 #define _FILE_OFFSET_BITS 64
@@ -127,4 +127,4 @@
 #define x264_pthread_cond_wait(c,m)  usleep(100)
 #endif
 
-#endif //_OSDEP_H
+#endif /* X264_OSDEP_H */

diff --git a/common/pixel.h b/common/pixel.h
index d533620c01ccd1bc66bc5726eeceafad250f55ee..c95a304660d690a761076675c9c034256b6eb821 100644 (file)
--- a/common/pixel.h
+++ b/common/pixel.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _PIXEL_H
-#define _PIXEL_H 1
+#ifndef X264_PIXEL_H
+#define X264_PIXEL_H
 
 // SSD assumes all args aligned
 // other cmp functions assume first arg aligned

diff --git a/common/ppc/dct.h b/common/ppc/dct.h
index 4902de570fbf4a2f03da3098ddf556dcca2a31f3..859e4ea808a10f0f1e0cdf614b621c46e2ea7521 100644 (file)
--- a/common/ppc/dct.h
+++ b/common/ppc/dct.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _PPC_DCT_H
-#define _PPC_DCT_H 1
+#ifndef X264_PPC_DCT_H
+#define X264_PPC_DCT_H
 
 void x264_sub4x4_dct_altivec( int16_t dct[4][4],
         uint8_t *pix1, uint8_t *pix2 );

diff --git a/common/ppc/mc.h b/common/ppc/mc.h
index e37792174b7a44d61818e5544b60744ecce58347..a15e614ddbebd463b16198724b0f8f384e5aca0a 100644 (file)
--- a/common/ppc/mc.h
+++ b/common/ppc/mc.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _PPC_MC_H
-#define _PPC_MC_H 1
+#ifndef X264_PPC_MC_H
+#define X264_PPC_MC_H
 
 void x264_mc_altivec_init( x264_mc_functions_t *pf );
 

diff --git a/common/ppc/pixel.h b/common/ppc/pixel.h
index f2d6a181e4a1bcfa9e6f03eef35deefa6da2ec79..b62e3a7e3ff009918bcef2b169744ab398c319c9 100644 (file)
--- a/common/ppc/pixel.h
+++ b/common/ppc/pixel.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _PPC_PIXEL_H
-#define _PPC_PIXEL_H 1
+#ifndef X264_PPC_PIXEL_H
+#define X264_PPC_PIXEL_H
 
 void x264_pixel_altivec_init( x264_pixel_function_t *pixf );
 

diff --git a/common/ppc/predict.h b/common/ppc/predict.h
index d78d016919cac75db0d05b86ce22b672ba6a935d..9a62ac82c1303f9179bbf56fa554d223c7180d66 100644 (file)
--- a/common/ppc/predict.h
+++ b/common/ppc/predict.h
@@ -20,9 +20,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _ALTIVEC_PREDICT_H
-#define _ALTIVEC_PREDICT_H 1
+#ifndef X264_ALTIVEC_PREDICT_H
+#define X264_ALTIVEC_PREDICT_H
 
 void x264_predict_16x16_init_altivec ( x264_predict_t pf[7] );
 
-#endif // _ALTIVEC_PREDICT_H
+#endif /* X264_ALTIVEC_PREDICT_H */

diff --git a/common/ppc/quant.h b/common/ppc/quant.h
index f10955a8c18db1c57d84512d05ff27f405c2e00b..1ec534c770d2e4731f957f208539ee20b1d85521 100644 (file)
--- a/common/ppc/quant.h
+++ b/common/ppc/quant.h
@@ -18,8 +18,8 @@
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 *****************************************************************************/
 
-#ifndef _PPC_QUANT_H
-#define _PPC_QUANT_H 1
+#ifndef X264_PPC_QUANT_H
+#define X264_PPC_QUANT_H
 
 void x264_quant_4x4_altivec( int16_t dct[4][4], uint16_t mf[16], uint16_t bias[16] );
 void x264_quant_8x8_altivec( int16_t dct[8][8], uint16_t mf[64], uint16_t bias[64] );

diff --git a/common/predict.h b/common/predict.h
index b034c04eea5a41fd0c8c38abdc019cd6c7b92db7..b9221680fc107d05aa701c07e654a0869bb83b1c 100644 (file)
--- a/common/predict.h
+++ b/common/predict.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _PREDICT_H
-#define _PREDICT_H 1
+#ifndef X264_PREDICT_H
+#define X264_PREDICT_H
 
 typedef void (*x264_predict_t)( uint8_t *src );
 typedef void (*x264_predict8x8_t)( uint8_t *src, uint8_t edge[33] );

diff --git a/common/quant.h b/common/quant.h
index 0fe7d0c9899ae99014acd37e8b35c20e7a51f72c..2e48c48dd32708be301740ce428f3535765455c6 100644 (file)
--- a/common/quant.h
+++ b/common/quant.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _QUANT_H
-#define _QUANT_H 1
+#ifndef X264_QUANT_H
+#define X264_QUANT_H
 
 typedef struct
 {

diff --git a/common/set.h b/common/set.h
index a018e7a0b4657dbcaf3d048c9d2c7a904f827936..e6173b0bd9969da3e4a90b44035421031f2fe401 100644 (file)
--- a/common/set.h
+++ b/common/set.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _SET_H
-#define _SET_H 1
+#ifndef X264_SET_H
+#define X264_SET_H
 
 enum profile_e
 {

diff --git a/common/sparc/pixel.h b/common/sparc/pixel.h
index ee392c12833129c0ed2016d6b8dcfec78df3cf2b..07af6843c69ef21acd19c8cedb6eca78823969c7 100644 (file)
--- a/common/sparc/pixel.h
+++ b/common/sparc/pixel.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _SPARC_PIXEL_H
-#define _SPARC_PIXEL_H 1
+#ifndef X264_SPARC_PIXEL_H
+#define X264_SPARC_PIXEL_H
 
 int x264_pixel_sad_8x8_vis( uint8_t *, int, uint8_t *, int );
 int x264_pixel_sad_8x16_vis( uint8_t *, int, uint8_t *, int );

diff --git a/common/visualize.h b/common/visualize.h
index 92c8b008fc449b55c862bea07b7e7382e0699055..34adccac6e6b8305de995eed6d19863d2034f49d 100644 (file)
--- a/common/visualize.h
+++ b/common/visualize.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _VISUALIZE_H
-#define _VISUALIZE_H 1
+#ifndef X264_VISUALIZE_H
+#define X264_VISUALIZE_H
 
 #include "common/common.h"
 

diff --git a/common/x86/dct.h b/common/x86/dct.h
index 7dd60e8e70814397b1227063b937c8c48aed8ce3..859937c4f47f684dcd1ef63c91b405b14e7e6ad7 100644 (file)
--- a/common/x86/dct.h
+++ b/common/x86/dct.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _I386_DCT_H
-#define _I386_DCT_H 1
+#ifndef X264_I386_DCT_H
+#define X264_I386_DCT_H
 
 void x264_sub4x4_dct_mmx( int16_t dct[4][4],  uint8_t *pix1, uint8_t *pix2 );
 void x264_sub8x8_dct_mmx( int16_t dct[4][4][4],  uint8_t *pix1, uint8_t *pix2 );

diff --git a/common/x86/mc.h b/common/x86/mc.h
index 7006aeae6573954604a73410ab54258991722d22..c5d186591c1135860b3f9df5ad6fe09f8e39f5cf 100644 (file)
--- a/common/x86/mc.h
+++ b/common/x86/mc.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _I386_MC_H
-#define _I386_MC_H 1
+#ifndef X264_I386_MC_H
+#define X264_I386_MC_H
 
 void x264_mc_init_mmx( int cpu, x264_mc_functions_t *pf );
 

diff --git a/common/x86/pixel.h b/common/x86/pixel.h
index bc4ee965455380a8d22d56131846207e1b815923..fcacaf22b94ee31c8058248d4b2efe91aec05d95 100644 (file)
--- a/common/x86/pixel.h
+++ b/common/x86/pixel.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _I386_PIXEL_H
-#define _I386_PIXEL_H 1
+#ifndef X264_I386_PIXEL_H
+#define X264_I386_PIXEL_H
 
 #define DECL_PIXELS( ret, name, suffix, args ) \
     ret x264_pixel_##name##_16x16_##suffix args;\

diff --git a/common/x86/predict.h b/common/x86/predict.h
index 9310313efbbad1d4b186a22e07db5dca7f133775..761aa58a705a1121d80f148ddbfc4ec04738c1f7 100644 (file)
--- a/common/x86/predict.h
+++ b/common/x86/predict.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _I386_PREDICT_H
-#define _I386_PREDICT_H 1
+#ifndef X264_I386_PREDICT_H
+#define X264_I386_PREDICT_H
 
 void x264_predict_16x16_init_mmx ( int cpu, x264_predict_t pf[7] );
 void x264_predict_8x8c_init_mmx  ( int cpu, x264_predict_t pf[7] );

diff --git a/common/x86/quant.h b/common/x86/quant.h
index f860f6abc5ceae6ee5406c814018d3fb3ddfdce0..42c9817e8d3f12369c24982b83a686f68ea3bda8 100644 (file)
--- a/common/x86/quant.h
+++ b/common/x86/quant.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _I386_QUANT_H
-#define _I386_QUANT_H 1
+#ifndef X264_I386_QUANT_H
+#define X264_I386_QUANT_H
 
 void x264_quant_2x2_dc_mmxext( int16_t dct[2][2], int mf, int bias );
 void x264_quant_4x4_dc_mmxext( int16_t dct[4][4], int mf, int bias );

diff --git a/encoder/analyse.h b/encoder/analyse.h
index d68e7d6b37ed7e66b74c96f25704a60856a84f96..119959331220b960e061bcf3e1f1fbafe34fb27c 100644 (file)
--- a/encoder/analyse.h
+++ b/encoder/analyse.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _ANALYSE_H
-#define _ANALYSE_H 1
+#ifndef X264_ANALYSE_H
+#define X264_ANALYSE_H
 
 void x264_macroblock_analyse( x264_t *h );
 void x264_slicetype_decide( x264_t *h );

diff --git a/encoder/macroblock.h b/encoder/macroblock.h
index ee69d40795f62da7c83495d0b7f1f57abffb968d..e80995d785ce446efa7171bc4a09cf23e3386f09 100644 (file)
--- a/encoder/macroblock.h
+++ b/encoder/macroblock.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _ENCODER_MACROBLOCK_H
-#define _ENCODER_MACROBLOCK_H 1
+#ifndef X264_ENCODER_MACROBLOCK_H
+#define X264_ENCODER_MACROBLOCK_H
 
 #include "common/macroblock.h"
 

diff --git a/encoder/me.h b/encoder/me.h
index e9760930b8b23d64120414646e5cd122395682ea..295dd14aed736812e2ed5457ebdca23967f3d4be 100644 (file)
--- a/encoder/me.h
+++ b/encoder/me.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _ME_H
-#define _ME_H 1
+#ifndef X264_ME_H
+#define X264_ME_H
 
 #define COST_MAX (1<<28)
 

diff --git a/encoder/ratecontrol.h b/encoder/ratecontrol.h
index 2aabda7e8237bd5e31e67b42d41b4d436e9093be..c55fd54c24328e381b58661b805c57d2f6dd9144 100644 (file)
--- a/encoder/ratecontrol.h
+++ b/encoder/ratecontrol.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _RATECONTROL_H
-#define _RATECONTROL_H 1
+#ifndef X264_RATECONTROL_H
+#define X264_RATECONTROL_H
 
 int  x264_ratecontrol_new   ( x264_t * );
 void x264_ratecontrol_delete( x264_t * );

diff --git a/encoder/set.h b/encoder/set.h
index dac2d2fc76ce6575f8eafbeb9da2f258ae445676..6672b44997550759dbbb090e4be7d6a982fa66e8 100644 (file)
--- a/encoder/set.h
+++ b/encoder/set.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _ENCODER_SET_H
-#define _ENCODER_SET_H 1
+#ifndef X264_ENCODER_SET_H
+#define X264_ENCODER_SET_H
 
 void x264_sps_init( x264_sps_t *sps, int i_id, x264_param_t *param );
 void x264_sps_write( bs_t *s, x264_sps_t *sps );

diff --git a/gtk/x264_gtk.h b/gtk/x264_gtk.h
index c57c89a27ca0f9cf9f42e112844a682cfed39795..7174e6a59ed1745fab342936c3dcc0fe88f05775 100644 (file)
--- a/gtk/x264_gtk.h
+++ b/gtk/x264_gtk.h
@@ -1,5 +1,5 @@
-#ifndef __X264_GTK_H__
-#define __X264_GTK_H__
+#ifndef X264_GTK_H
+#define X264_GTK_H
 
 
 #include "x264_gtk_enum.h"
@@ -108,4 +108,4 @@ void          x264_gtk_shutdown (GtkWidget *dialog);
 void          x264_gtk_free (X264_Gtk *x264_gtk);
 
 
-#endif /* __X264_GTK_H__ */
+#endif /* X264_GTK_H */

diff --git a/gtk/x264_gtk_bitrate.h b/gtk/x264_gtk_bitrate.h
index f44937b528081ef7af6e4409607ece32978637db..98993ef96e70b17a1c4f8532a1cec1642b185c93 100644 (file)
--- a/gtk/x264_gtk_bitrate.h
+++ b/gtk/x264_gtk_bitrate.h
@@ -1,8 +1,8 @@
-#ifndef __X264_GTK_BITRATE_H__
-#define __X264_GTK_BITRATE_H__
+#ifndef X264_GTK_BITRATE_H
+#define X264_GTK_BITRATE_H
 
 
 GtkWidget *_bitrate_page (X264_Gui_Config *config);
 
 
-#endif /* __X264_GTK_BITRATE_H__ */
+#endif /* X264_GTK_BITRATE_H */

diff --git a/gtk/x264_gtk_cqm.h b/gtk/x264_gtk_cqm.h
index 8f6ebe1baf336fb62eb6285b249949d807c6fab0..ea1633e2f232489d11c59ff45045c34681807376 100644 (file)
--- a/gtk/x264_gtk_cqm.h
+++ b/gtk/x264_gtk_cqm.h
@@ -1,8 +1,8 @@
-#ifndef __X264_GTK_CQM_H__
-#define __X264_GTK_CQM_H__
+#ifndef X264_GTK_CQM_H
+#define X264_GTK_CQM_H
 
 
 GtkWidget *_cqm_page (X264_Gui_Config *config);
 
 
-#endif /* __X264_GTK_CQM_H__ */
+#endif /* X264_GTK_CQM_H */

diff --git a/gtk/x264_gtk_demuxers.h b/gtk/x264_gtk_demuxers.h
index 47fb38c4e432a027bc67087bcbeae2032f7bc9f2..de9ab01656a6ff747109ba82260a92df44851ad1 100644 (file)
--- a/gtk/x264_gtk_demuxers.h
+++ b/gtk/x264_gtk_demuxers.h
@@ -1,5 +1,5 @@
-#ifndef __X264_GTK_MUXERS_H__
-#define __X264_GTK_MUXERS_H__
+#ifndef X264_GTK_MUXERS_H
+#define X264_GTK_MUXERS_H
 
 #include "../config.h"
 #include "../muxers.h"
@@ -15,4 +15,4 @@ typedef enum {
 } X264_Demuxer_Type;
 /* static int X264_Num_Demuxers = (int)X264_DEMUXER_UNKOWN; */
 
-#endif  /* __X264_GTK_MUXERS_H__ */
+#endif  /* X264_GTK_MUXERS_H */

diff --git a/gtk/x264_gtk_encode_encode.h b/gtk/x264_gtk_encode_encode.h
index e075480253b7f57c43dd36d8ece6d270b1d3ba84..e1a31b1e8143851f4c70408b4d089ebfb84af42d 100644 (file)
--- a/gtk/x264_gtk_encode_encode.h
+++ b/gtk/x264_gtk_encode_encode.h
@@ -1,8 +1,8 @@
-#ifndef __X264_GTK_ENCODE_ENCODE_H__
-#define __X264_GTK_ENCODE_ENCODE_H__
+#ifndef X264_GTK_ENCODE_ENCODE_H
+#define X264_GTK_ENCODE_ENCODE_H
 
 
 gpointer x264_gtk_encode_encode (X264_Thread_Data *thread_data);
 
 
-#endif /* __X264_GTK_ENCODE_ENCODE_H__ */
+#endif /* X264_GTK_ENCODE_ENCODE_H */

diff --git a/gtk/x264_gtk_encode_main_window.h b/gtk/x264_gtk_encode_main_window.h
index 87af2dc7adbe455d18ebc1a5bc2158da1d9b36d6..6b5ad004c564eed149b28eb567c26a5d79dffd1e 100644 (file)
--- a/gtk/x264_gtk_encode_main_window.h
+++ b/gtk/x264_gtk_encode_main_window.h
@@ -1,8 +1,8 @@
-#ifndef __X264_GTK_ENCODE_MAIN_WINDOW_H__
-#define __X264_GTK_ENCODE_MAIN_WINDOW_H__
+#ifndef X264_GTK_ENCODE_MAIN_WINDOW_H
+#define X264_GTK_ENCODE_MAIN_WINDOW_H
 
 
 void x264_gtk_encode_main_window ();
 
 
-#endif /* __X264_GTK_ENCODE_MAIN_WINDOW_H__ */
+#endif /* X264_GTK_ENCODE_MAIN_WINDOW_H */

diff --git a/gtk/x264_gtk_encode_private.h b/gtk/x264_gtk_encode_private.h
index a90dd3ea8a5e36f52e1ae2a075504dccd9c9b410..cebfc4ae2440f54a130b6782d6891428152daa87 100644 (file)
--- a/gtk/x264_gtk_encode_private.h
+++ b/gtk/x264_gtk_encode_private.h
@@ -1,5 +1,5 @@
-#ifndef __X264_GTK_ENCODE_PRIVATE_H__
-#define __X264_GTK_ENCODE_PRIVATE_H__
+#ifndef X264_GTK_ENCODE_PRIVATE_H
+#define X264_GTK_ENCODE_PRIVATE_H
 
 
 #define __UNUSED__ __attribute__((unused))
@@ -43,4 +43,4 @@ struct X264_Pipe_Data_
 };
 
 
-#endif /* __X264_GTK_ENCODE_PRIVATE_H__ */
+#endif /* X264_GTK_ENCODE_PRIVATE_H */

diff --git a/gtk/x264_gtk_encode_status_window.h b/gtk/x264_gtk_encode_status_window.h
index 13ce035197c0d9272e81031bf61a9d74943afead..ae657e5dc40dd88ec5c2e418c5d144c4310ba3b0 100644 (file)
--- a/gtk/x264_gtk_encode_status_window.h
+++ b/gtk/x264_gtk_encode_status_window.h
@@ -1,8 +1,8 @@
-#ifndef __X264_GTK_ENCODE_STATUS_WINDOW_H__
-#define __X264_GTK_ENCODE_STATUS_WINDOW_H__
+#ifndef X264_GTK_ENCODE_STATUS_WINDOW_H
+#define X264_GTK_ENCODE_STATUS_WINDOW_H
 
 
 GtkWidget *x264_gtk_encode_status_window (X264_Thread_Data *thread_data);
 
 
-#endif /* __X264_GTK_ENCODE_STATUS_WINDOW_H__ */
+#endif /* X264_GTK_ENCODE_STATUS_WINDOW_H */

diff --git a/gtk/x264_gtk_enum.h b/gtk/x264_gtk_enum.h
index 9e498cab613f64716d2a9499ded46e897b4f82db..99e0048c2428321b30a57539729fc6bbda60043c 100644 (file)
--- a/gtk/x264_gtk_enum.h
+++ b/gtk/x264_gtk_enum.h
@@ -1,5 +1,5 @@
-#ifndef __X264_GTK_ENUM_H__
-#define __X264_GTK_ENUM_H__
+#ifndef X264_GTK_ENUM_H
+#define X264_GTK_ENUM_H
 
 typedef enum
 {
@@ -54,4 +54,4 @@ typedef enum
 }X264_Cqm_Preset;
 
 
-#endif /* __X264_GTK_ENUM_H__ */
+#endif /* X264_GTK_ENUM_H */

diff --git a/gtk/x264_gtk_i18n.h b/gtk/x264_gtk_i18n.h
index 1fa46e86c0309b38fd351ba76cd691589233792d..f3e5129aba2b575d7949a9614721ce4a822d0332 100644 (file)
--- a/gtk/x264_gtk_i18n.h
+++ b/gtk/x264_gtk_i18n.h
@@ -1,5 +1,5 @@
-#ifndef _X264_GTK_I18N_
-#define _X264_GTK_I18N_
+#ifndef X264_GTK_I18N_H
+#define X264_GTK_I18N_H
 
 
 #include <libintl.h>
@@ -8,7 +8,7 @@
 #define _(X) gettext(X)
 #define GETTEXT_DOMAIN "x264_gtk"
 
-#ifdef __X264_GTK_PRIVATE_H__
+#ifdef X264_GTK_PRIVATE_H
 /* x264_path must be known for this to work */
 #  define BIND_X264_TEXTDOMAIN()                        \
   gchar* _tmp = x264_gtk_path("locale");                    \
@@ -21,4 +21,4 @@
 #endif
 
 
-#endif /* _X264_GTK_I18N_ */
+#endif /* X264_GTK_I18N_H */

diff --git a/gtk/x264_gtk_mb.h b/gtk/x264_gtk_mb.h
index 4649624a17b178e98e367145d7117dd3aaf12a5b..0e7a364690bc70419d22d399146406cafa49948d 100644 (file)
--- a/gtk/x264_gtk_mb.h
+++ b/gtk/x264_gtk_mb.h
@@ -1,8 +1,8 @@
-#ifndef __X264_GTK_MB_H__
-#define __X264_GTK_MB_H__
+#ifndef X264_GTK_MB_H
+#define X264_GTK_MB_H
 
 
 GtkWidget *_mb_page (X264_Gui_Config *config);
 
 
-#endif /* __X264_GTK_MB_H__ */
+#endif /* X264_GTK_MB_H */

diff --git a/gtk/x264_gtk_more.h b/gtk/x264_gtk_more.h
index f94134d9e6503224576108631357a1024f2a8766..cf88b289a6e5e5d14c49aa25cced7cd5e873e028 100644 (file)
--- a/gtk/x264_gtk_more.h
+++ b/gtk/x264_gtk_more.h
@@ -1,8 +1,8 @@
-#ifndef __X264_GTK_MORE_H__
-#define __X264_GTK_MORE_H__
+#ifndef X264_GTK_MORE_H
+#define X264_GTK_MORE_H
 
 
 GtkWidget *_more_page (X264_Gui_Config *config);
 
 
-#endif /* __X264_GTK_MORE_H__ */
+#endif /* X264_GTK_MORE_H */

diff --git a/gtk/x264_gtk_private.h b/gtk/x264_gtk_private.h
index 6d08f53fd69b55400d448267cd689d18365dea98..8b8f47539db6d34ecd46bb5bd75d9097c890ce1b 100644 (file)
--- a/gtk/x264_gtk_private.h
+++ b/gtk/x264_gtk_private.h
@@ -1,5 +1,5 @@
-#ifndef __X264_GTK_PRIVATE_H__
-#define __X264_GTK_PRIVATE_H__
+#ifndef X264_GTK_PRIVATE_H
+#define X264_GTK_PRIVATE_H
 
 
 #define __UNUSED__ __attribute__((unused))
@@ -171,4 +171,4 @@ struct X264_Gui_Zone_
 gchar *x264_gtk_path (const char* more_path);
 
 
-#endif /* __X264_GTK_PRIVATE_H__ */
+#endif /* X264_GTK_PRIVATE_H */

diff --git a/gtk/x264_gtk_rc.h b/gtk/x264_gtk_rc.h
index 865196f04e323da366088c5df8f3cf8617a38089..b2aa9e865273cb4a3d2abd84e2a06c55583bc12e 100644 (file)
--- a/gtk/x264_gtk_rc.h
+++ b/gtk/x264_gtk_rc.h
@@ -1,8 +1,8 @@
-#ifndef __X264_GTK_RC_H__
-#define __X264_GTK_RC_H__
+#ifndef X264_GTK_RC_H
+#define X264_GTK_RC_H
 
 
 GtkWidget *_rate_control_page (X264_Gui_Config *config);
 
 
-#endif /* __X264_GTK_RC_H__ */
+#endif /* X264_GTK_RC_H */

diff --git a/matroska.h b/matroska.h
index ee95d0b1de406be8579a71581d48ab5e334a32a4..a23c43e628be79f5648e40d4ef09b15df3045755 100644 (file)
--- a/matroska.h
+++ b/matroska.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _MATROSKA_H
-#define _MATROSKA_H 1
+#ifndef X264_MATROSKA_H
+#define X264_MATROSKA_H
 
 typedef struct mk_Writer mk_Writer;
 

diff --git a/muxers.h b/muxers.h
index eef40cd457be6a54f18e18417747bcaecd730e40..372aa639c5ba60216f140f9ec64d2e0082997487 100644 (file)
--- a/muxers.h
+++ b/muxers.h
@@ -1,5 +1,5 @@
-#ifndef _X264_MUXERS_H_
-#define _X264_MUXERS_H_
+#ifndef X264_MUXERS_H
+#define X264_MUXERS_H
 
 typedef void *hnd_t;
 

diff --git a/x264.h b/x264.h
index e49f1a4cc2d3d6d381303f9ab505702a3a316447..d2c6510312ac95bce0edc119b46af5aeee5306a9 100644 (file)
--- a/x264.h
+++ b/x264.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _X264_H
-#define _X264_H 1
+#ifndef X264_X264_H
+#define X264_X264_H
 
 #if !defined(_STDINT_H) && !defined(_STDINT_H_) && \
     !defined(_INTTYPES_H) && !defined(_INTTYPES_H_)