[packages/DirectFB.git] / DirectFB-gcc4.patch

diff -ur DirectFB-1.0.0.orig/include/directfb.h DirectFB-1.0.0/include/directfb.h
--- DirectFB-1.0.0.orig/include/directfb.h	2007-03-09 11:43:31.000000000 +0100
+++ DirectFB-1.0.0/include/directfb.h	2007-03-09 14:22:40.000000000 +0100
@@ -674,7 +674,7 @@
      DSBLIT_SRC_PREMULTCOLOR   = 0x00000200, /* modulates the source color with the color alpha */
      DSBLIT_XOR                = 0x00000400, /* bitwise xor the destination pixels with the
                                                 source pixels after premultiplication */
-     DSBLIT_INDEX_TRANSLATION  = 0x00000800, /* do fast indexed to indexed translation,
+     DSBLIT_INDEX_TRANSLATION  = 0x00000800  /* do fast indexed to indexed translation,
                                                 this flag is mutual exclusive with all others */
 } DFBSurfaceBlittingFlags;
 
@@ -846,7 +846,7 @@
                                            any character advance of fixed or
                                            proportional fonts */
      DFDESC_FRACT_HEIGHT = 0x00000020,  /* fractional height is set */
-     DFDESC_FRACT_WIDTH  = 0x00000040,  /* fractional width is set */
+     DFDESC_FRACT_WIDTH  = 0x00000040   /* fractional width is set */
 } DFBFontDescriptionFlags;
 
 /*
@@ -1295,7 +1295,7 @@
      DVCAPS_HUE         = 0x00000040,  /* supports Hue adjustment          */
      DVCAPS_SATURATION  = 0x00000080,  /* supports Saturation adjustment   */
      DVCAPS_INTERACTIVE = 0x00000100,  /* supports SendEvent               */
-     DVCAPS_VOLUME      = 0x00000200,  /* supports Volume adjustment       */
+     DVCAPS_VOLUME      = 0x00000200   /* supports Volume adjustment       */
 } DFBVideoProviderCapabilities;
 
 /*
@@ -2878,7 +2878,7 @@
      DSPD_SRC_ATOP       =  9, /* fs: da      fd: 1.0-sa */
      DSPD_DST_ATOP       = 10, /* fs: 1.0-da  fd: sa     */
      DSPD_ADD            = 11, /* fs: 1.0     fd: 1.0    */
-     DSPD_XOR            = 12, /* fs: 1.0-da  fd: 1.0-sa */
+     DSPD_XOR            = 12  /* fs: 1.0-da  fd: 1.0-sa */
 } DFBSurfacePorterDuffRule;
 
 /*
Commit	Line	Data
e1d96f9f JB	1	diff -ur DirectFB-1.0.0.orig/include/directfb.h DirectFB-1.0.0/include/directfb.h
	2	--- DirectFB-1.0.0.orig/include/directfb.h 2007-03-09 11:43:31.000000000 +0100
	3	+++ DirectFB-1.0.0/include/directfb.h 2007-03-09 14:22:40.000000000 +0100
	4	@@ -674,7 +674,7 @@
	5	DSBLIT_SRC_PREMULTCOLOR = 0x00000200, /* modulates the source color with the color alpha */
	6	DSBLIT_XOR = 0x00000400, /* bitwise xor the destination pixels with the
	7	source pixels after premultiplication */
	8	- DSBLIT_INDEX_TRANSLATION = 0x00000800, /* do fast indexed to indexed translation,
	9	+ DSBLIT_INDEX_TRANSLATION = 0x00000800 /* do fast indexed to indexed translation,
	10	this flag is mutual exclusive with all others */
	11	} DFBSurfaceBlittingFlags;
df459776	12
dfe0524a PS	13	@@ -846,7 +846,7 @@
	14	any character advance of fixed or
	15	proportional fonts */
	16	DFDESC_FRACT_HEIGHT = 0x00000020, /* fractional height is set */
	17	- DFDESC_FRACT_WIDTH = 0x00000040, /* fractional width is set */
	18	+ DFDESC_FRACT_WIDTH = 0x00000040 /* fractional width is set */
	19	} DFBFontDescriptionFlags;
	20
e1d96f9f	21	/*
e1d96f9f JB	22	@@ -1295,7 +1295,7 @@
	23	DVCAPS_HUE = 0x00000040, /* supports Hue adjustment */
	24	DVCAPS_SATURATION = 0x00000080, /* supports Saturation adjustment */
	25	DVCAPS_INTERACTIVE = 0x00000100, /* supports SendEvent */
	26	- DVCAPS_VOLUME = 0x00000200, /* supports Volume adjustment */
	27	+ DVCAPS_VOLUME = 0x00000200 /* supports Volume adjustment */
	28	} DFBVideoProviderCapabilities;
	29
	30	/*
	31	@@ -2878,7 +2878,7 @@
	32	DSPD_SRC_ATOP = 9, /* fs: da fd: 1.0-sa */
	33	DSPD_DST_ATOP = 10, /* fs: 1.0-da fd: sa */
	34	DSPD_ADD = 11, /* fs: 1.0 fd: 1.0 */
	35	- DSPD_XOR = 12, /* fs: 1.0-da fd: 1.0-sa */
	36	+ DSPD_XOR = 12 /* fs: 1.0-da fd: 1.0-sa */
	37	} DFBSurfacePorterDuffRule;
	38
dfe0524a	39	/*