Commit 4ee9642a authored by Guillaume Poirier's avatar Guillaume Poirier
Browse files

fix illegal identifiers in multiple inclusion guards

patch by Diego Biurrun % diego A biurrun P de %
parent 34ed6747
......@@ -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
{
......
......@@ -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
{
......
......@@ -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
......
......@@ -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 );
......
......@@ -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) :\
......
......@@ -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);
......
......@@ -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
......
......@@ -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
{
......
......@@ -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
......
......@@ -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 */
......@@ -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
......
......@@ -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 );
......
......@@ -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 );
......
......@@ -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 );
......
......@@ -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 */
......@@ -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] );
......
......@@ -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] );
......
......@@ -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
{
......
......@@ -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
{
......
......@@ -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 );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment