1
0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-05 21:34:17 +01:00

Code refactoring: replaced macro 'XSHM' by 'USE_XSHM' for consistency

The usual way to define a macro in is to name macro with 'USE_xxx' when
they are used to enable a feature 'xxx'.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2013-11-17 18:51:19 +01:00
committed by Carlos R. Mafra
parent ee3422dd10
commit 062f6dd59d
5 changed files with 24 additions and 24 deletions

View File

@@ -35,7 +35,7 @@
#include "wraster.h"
#ifdef XSHM
#ifdef USE_XSHM
extern Pixmap R_CreateXImageMappedPixmap(RContext * context, RXImage * ximage);
#endif
@@ -819,7 +819,7 @@ static RXImage *image2Bitmap(RContext * ctx, RImage * image, int threshold)
int RConvertImage(RContext * context, RImage * image, Pixmap * pixmap)
{
RXImage *ximg = NULL;
#ifdef XSHM
#ifdef USE_XSHM
Pixmap tmp;
#endif
@@ -852,7 +852,7 @@ int RConvertImage(RContext * context, RImage * image, Pixmap * pixmap)
*pixmap = XCreatePixmap(context->dpy, context->drawable, image->width, image->height, context->depth);
#ifdef XSHM
#ifdef USE_XSHM
if (context->flags.use_shared_pixmap && ximg->is_shared)
tmp = R_CreateXImageMappedPixmap(context, ximg);
else
@@ -873,9 +873,9 @@ int RConvertImage(RContext * context, RImage * image, Pixmap * pixmap)
} else {
RPutXImage(context, *pixmap, context->copy_gc, ximg, 0, 0, 0, 0, image->width, image->height);
}
#else /* !XSHM */
#else /* !USE_XSHM */
RPutXImage(context, *pixmap, context->copy_gc, ximg, 0, 0, 0, 0, image->width, image->height);
#endif /* !XSHM */
#endif /* !USE_XSHM */
RDestroyXImage(context, ximg);