[ros-diffs] [jgardou] 56933: [DIBLIB] - Fix GCC compilation

Author: jgardou
Date: Sun Jul 22 00:15:02 2012
New Revision: 56933

URL: http://svn.reactos.org/svn/reactos?rev=56933&view=rev
Log:
[DIBLIB]
- Fix GCC compilation

Modified:
    trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c
    trunk/reactos/win32ss/gdi/diblib/DibLib.h

Modified: trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/BitBlt_…
==============================================================================
--- trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c [iso-8859-1] Sun Jul 22 00:15:02
2012
@@ -45,14 +45,15 @@
         pjSrcBase += pBltData->siSrc.cjAdvanceY;
     }
 }
+#define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf_manual 1
 #else
 #define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf Dib_BitBlt_SRCCOPY_EqSurf
 #endif
 
-#define Dib_BitBlt_SRCCOPY_S8_D8_EqSurf_manual 1
-#define Dib_BitBlt_SRCCOPY_S16_D16_EqSurf_manual 1
-#define Dib_BitBlt_SRCCOPY_S24_D24_EqSurf_manual 1
-#define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf_manual 1
+#define Dib_BitBlt_SRCCOPY_EqSurf_manual 1
+// #define Dib_BitBlt_SRCCOPY_S16_D16_EqSurf_manual 1
+// #define Dib_BitBlt_SRCCOPY_S24_D24_EqSurf_manual 1
+// #define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf_manual 1
 
 #define __USES_SOURCE 1
 #define __USES_PATTERN 0

Modified: trunk/reactos/win32ss/gdi/diblib/DibLib.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/DibLib.…
==============================================================================
--- trunk/reactos/win32ss/gdi/diblib/DibLib.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/diblib/DibLib.h [iso-8859-1] Sun Jul 22 00:15:02 2012
@@ -30,15 +30,16 @@
 
 #define __PASTE_(s1,s2) s1##s2
 #define __PASTE(s1,s2) __PASTE_(s1,s2)
+#define EVALUATE(x) x
 
 #define __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) Dib_ ## name ## _S ## src_bpp
## _D ## dst_bpp
 #define __DIB_FUNCTION_NAME_SRCDST(name, src_bpp, dst_bpp)
__DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp)
 
 #define __DIB_FUNCTION_NAME_DST2(name, dst_bpp) Dib_ ## name ## _D ## dst_bpp
 #define __DIB_FUNCTION_NAME_DST(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_DST2(name,
dst_bpp)
-#define __DIB_FUNCTION_NAME_SRCDSTEQ(name, src_bpp, dst_bpp)
__DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) ## _EqSurf
-#define __DIB_FUNCTION_NAME_SRCDSTEQL2R(name, src_bpp, dst_bpp)
__DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) ## _EqSurfL2R
-#define __DIB_FUNCTION_NAME_SRCDSTEQR2L(name, src_bpp, dst_bpp)
__DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) ## _EqSurfR2L
+#define __DIB_FUNCTION_NAME_SRCDSTEQ(name, src_bpp, dst_bpp)
__PASTE(__DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp), _EqSurf)
+#define __DIB_FUNCTION_NAME_SRCDSTEQL2R(name, src_bpp, dst_bpp)
__PASTE(__DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp), _EqSurfL2R)
+#define __DIB_FUNCTION_NAME_SRCDSTEQR2L(name, src_bpp, dst_bpp)
__PASTE(__DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp), _EqSurfR2L)
 
 #define _ReadPixel_1(pjSource, jShift) (((*(pjSource)) >> (jShift)) & 1)
 #define _WritePixel_1(pjDest, jShift, ulColor) (void)(*(pjDest) = (UCHAR)((*(pjDest)
& ~(1<<(jShift))) | ((ulColor)<<(jShift))))