summaryrefslogtreecommitdiff
path: root/src/powder.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/powder.c
parentc5df30d90bc5591efa2e176dbd6fa405cf985c84 (diff)
downloadpowder-43cbb294ef68683785b6f77826c76e40a0473410.zip
powder-43cbb294ef68683785b6f77826c76e40a0473410.tar.gz
Visual Studio and MinGW comapatbility
Diffstat (limited to 'src/powder.c')
-rw-r--r--src/powder.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/powder.c b/src/powder.c
index c28129a..5e6851e 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -360,7 +360,7 @@ void kill_part(int i)
pfree = i;
}
-#ifdef WIN32
+#if defined(WIN32) && !defined(__GNUC__)
_inline int create_part(int p, int x, int y, int t)
#else
inline int create_part(int p, int x, int y, int t)
@@ -656,7 +656,7 @@ static void create_cherenkov_photon(int pp)
parts[i].vy *= r;
}
-#ifdef WIN32
+#if defined(WIN32) && !defined(__GNUC__)
_inline void delete_part(int x, int y)
#else
inline void delete_part(int x, int y)
@@ -674,7 +674,7 @@ inline void delete_part(int x, int y)
pmap[y][x] = 0; // just in case
}
-#ifdef WIN32
+#if defined(WIN32) && !defined(__GNUC__)
_inline int is_wire(int x, int y)
#else
inline int is_wire(int x, int y)
@@ -683,7 +683,7 @@ inline int is_wire(int x, int y)
return bmap[y][x]==6 || bmap[y][x]==7 || bmap[y][x]==3 || bmap[y][x]==8 || bmap[y][x]==11 || bmap[y][x]==12;
}
-#ifdef WIN32
+#if defined(WIN32) && !defined(__GNUC__)
_inline int is_wire_off(int x, int y)
#else
inline int is_wire_off(int x, int y)
@@ -774,7 +774,7 @@ void set_emap(int x, int y)
}
}
-#ifdef WIN32
+#if defined(WIN32) && !defined(__GNUC__)
_inline int parts_avg(int ci, int ni)
#else
inline int parts_avg(int ci, int ni)