Visual Studio and MinGW comapatbility

This commit is contained in:
Simon
2010-11-06 17:42:22 +00:00
parent c5df30d90b
commit 43cbb294ef
6 changed files with 22 additions and 22 deletions

View File

@@ -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);

View File

@@ -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);

View File

@@ -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);