projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040821-5-src
[rocksndiamonds.git]
/
src
/
libgame
/
x11.c
diff --git
a/src/libgame/x11.c
b/src/libgame/x11.c
index 2a21abcc89af91b55eb78c2c134cb0d1042bb5d6..f03e961cd8c461e1d1abf5368ee5139ca24a9909 100644
(file)
--- a/
src/libgame/x11.c
+++ b/
src/libgame/x11.c
@@
-106,8
+106,8
@@
static DrawWindow *X11InitWindow()
#endif
int screen_width, screen_height;
int win_xpos, win_ypos;
#endif
int screen_width, screen_height;
int win_xpos, win_ypos;
- unsigned long pen_fg = WhitePixel(display,screen);
- unsigned long pen_bg = BlackPixel(display,screen);
+ unsigned long pen_fg = WhitePixel(display,
screen);
+ unsigned long pen_bg = BlackPixel(display,
screen);
const int width = video.width, height = video.height;
int i;
const int width = video.width, height = video.height;
int i;
@@
-425,12
+425,14
@@
inline Pixel X11GetPixelFromRGB(unsigned int color_r, unsigned int color_g,
inline void X11DestroyImage(XImage *ximage)
{
inline void X11DestroyImage(XImage *ximage)
{
+#if defined(TARGET_X11_NATIVE)
/* this seems to be needed for OS/2, but does not hurt on other platforms */
if (ximage->data != NULL)
{
free(ximage->data);
ximage->data = NULL;
}
/* this seems to be needed for OS/2, but does not hurt on other platforms */
if (ximage->data != NULL)
{
free(ximage->data);
ximage->data = NULL;
}
+#endif /* TARGET_X11_NATIVE */
XDestroyImage(ximage);
}
XDestroyImage(ximage);
}