summaryrefslogtreecommitdiff
path: root/includes/powder.h
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 /includes/powder.h
parentc5df30d90bc5591efa2e176dbd6fa405cf985c84 (diff)
downloadpowder-43cbb294ef68683785b6f77826c76e40a0473410.zip
powder-43cbb294ef68683785b6f77826c76e40a0473410.tar.gz
Visual Studio and MinGW comapatbility
Diffstat (limited to 'includes/powder.h')
-rw-r--r--includes/powder.h10
1 files changed, 5 insertions, 5 deletions
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);