summaryrefslogtreecommitdiff
path: root/src/graphics.c
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2010-11-06 17:42:22 (GMT)
committer Simon <simon@hardwired.org.uk>2010-11-06 17:42:22 (GMT)
commit43cbb294ef68683785b6f77826c76e40a0473410 (patch)
tree59d977271e0b8693b4bf8e0d2f14dd098e80a5c5 /src/graphics.c
parentc5df30d90bc5591efa2e176dbd6fa405cf985c84 (diff)
downloadpowder-43cbb294ef68683785b6f77826c76e40a0473410.zip
powder-43cbb294ef68683785b6f77826c76e40a0473410.tar.gz
Visual Studio and MinGW comapatbility
Diffstat (limited to 'src/graphics.c')
-rw-r--r--src/graphics.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/graphics.c b/src/graphics.c
index f259a89..67a1324 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -757,7 +757,7 @@ void draw_menu(pixel *vid_buf, int i, int hover)
}
}
-#ifdef WIN32
+#if defined(WIN32) && !defined(__GNUC__)
_inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
#else
inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
@@ -776,7 +776,7 @@ inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
vid[y*(XRES+BARSIZE)+x] = PIXRGB(r,g,b);
}
-#ifdef WIN32
+#if defined(WIN32) && !defined(__GNUC__)
_inline int drawchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a)
#else
inline int drawchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a)
@@ -1054,7 +1054,7 @@ int textposxy(char *s, int width, int w, int h)
return n;
}
-#ifdef WIN32
+#if defined(WIN32) && !defined(__GNUC__)
_inline void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
#else
inline void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a)