diff options
| author | Simon <simon@hardwired.org.uk> | 2010-11-06 17:42:22 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2010-11-06 17:42:22 (GMT) |
| commit | 43cbb294ef68683785b6f77826c76e40a0473410 (patch) | |
| tree | 59d977271e0b8693b4bf8e0d2f14dd098e80a5c5 /includes | |
| parent | c5df30d90bc5591efa2e176dbd6fa405cf985c84 (diff) | |
| download | powder-43cbb294ef68683785b6f77826c76e40a0473410.zip powder-43cbb294ef68683785b6f77826c76e40a0473410.tar.gz | |
Visual Studio and MinGW comapatbility
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/graphics.h | 6 | ||||
| -rw-r--r-- | includes/misc.h | 6 | ||||
| -rw-r--r-- | includes/powder.h | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/includes/graphics.h b/includes/graphics.h index 7019351..e23fe9d 100644 --- a/includes/graphics.h +++ b/includes/graphics.h @@ -63,13 +63,13 @@ int draw_tool_xy(pixel *vid_buf, int x, int y, int b, unsigned pc); 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 extern inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a); #endif -#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 extern inline int drawchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a); @@ -99,7 +99,7 @@ int textwidthx(char *s, int w); int textposxy(char *s, int width, int w, int h); -#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 void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a); diff --git a/includes/misc.h b/includes/misc.h index 9a92a71..db3c2cb 100644 --- a/includes/misc.h +++ b/includes/misc.h @@ -21,19 +21,19 @@ __asm__ __volatile ("cpuid":\ static char hex[] = "0123456789ABCDEF"; //Signum function -#ifdef WIN32 +#if defined(WIN32) && !defined(__GNUC__) extern _inline int isign(float i); #else extern inline int isign(float i); #endif -#ifdef WIN32 +#if defined(WIN32) && !defined(__GNUC__) extern _inline unsigned clamp_flt(float f, float min, float max); #else extern inline unsigned clamp_flt(float f, float min, float max); #endif -#ifdef WIN32 +#if defined(WIN32) && !defined(__GNUC__) extern _inline float restrict_flt(float f, float min, float max); #else extern inline float restrict_flt(float f, float min, float max); diff --git a/includes/powder.h b/includes/powder.h index 4f1f2ff..8f19d28 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -391,25 +391,25 @@ int try_move(int i, int x, int y, int nx, int ny); void kill_part(int i); -#ifdef WIN32 +#if defined(WIN32) && !defined(__GNUC__) extern _inline int create_part(int p, int x, int y, int t); #else extern inline int create_part(int p, int x, int y, int t); #endif -#ifdef WIN32 +#if defined(WIN32) && !defined(__GNUC__) extern _inline void delete_part(int x, int y); #else extern inline void delete_part(int x, int y); #endif -#ifdef WIN32 +#if defined(WIN32) && !defined(__GNUC__) extern _inline int is_wire(int x, int y); #else extern inline int is_wire(int x, int y); #endif -#ifdef WIN32 +#if defined(WIN32) && !defined(__GNUC__) extern _inline int is_wire_off(int x, int y); #else extern inline int is_wire_off(int x, int y); @@ -417,7 +417,7 @@ extern inline int is_wire_off(int x, int y); void set_emap(int x, int y); -#ifdef WIN32 +#if defined(WIN32) && !defined(__GNUC__) _inline int parts_avg(int ci, int ni); #else int parts_avg(int ci, int ni); |