diff options
| author | Simon <simon@hardwired.org.uk> | 2011-04-08 14:28:57 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2011-04-08 14:28:57 (GMT) |
| commit | 626cc8fa6a6cf5e2f046d138b72e3122614c46ad (patch) | |
| tree | 670c71d232ad958ec4689e9653741c6907d3becc /includes/powder.h | |
| parent | 60039b531e4bec2c8f16817b8da2beda148e828d (diff) | |
| download | powder-626cc8fa6a6cf5e2f046d138b72e3122614c46ad.zip powder-626cc8fa6a6cf5e2f046d138b72e3122614c46ad.tar.gz | |
Remove a TON of warnings
Diffstat (limited to 'includes/powder.h')
| -rw-r--r-- | includes/powder.h | 51 |
1 files changed, 9 insertions, 42 deletions
diff --git a/includes/powder.h b/includes/powder.h index 8e40ead..66614b2 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -814,43 +814,19 @@ static void create_gain_photon(int pp); void kill_part(int i); -#if defined(WIN32) && !defined(__GNUC__) -extern _inline void part_change_type(int i, int x, int y, int t); -#else -extern inline void part_change_type(int i, int x, int y, int t); -#endif +void part_change_type(int i, int x, int y, int t); -#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 +int create_part(int p, int x, int y, int t); -#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 +void delete_part(int x, int y); -#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 +int is_wire(int x, int y); -#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); -#endif +int is_wire_off(int x, int y); void set_emap(int x, int y); -#if defined(WIN32) && !defined(__GNUC__) -extern _inline int parts_avg(int ci, int ni, int t); -#else -extern int parts_avg(int ci, int ni, int t); -#endif +int parts_avg(int ci, int ni, int t); int nearest_part(int ci, int t); @@ -869,20 +845,11 @@ int flood_parts(int x, int y, int c, int cm, int bm); int create_parts(int x, int y, int rx, int ry, int c); void create_line(int x1, int y1, int x2, int y2, int rx, int ry, int c); -void *transform_save(void *odata, int *size, matrix2d transform, vector2d translate); - -#if defined(WIN32) && !defined(__GNUC__) -extern _inline void orbitalparts_get(int block1, int block2, int resblock1[], int resblock2[]); -#else -extern inline void orbitalparts_get(int block1, int block2, int resblock1[], int resblock2[]); -#endif +void *transform_save(void *odata, int *size, matrix2d transform, vector2d translate); +void orbitalparts_get(int block1, int block2, int resblock1[], int resblock2[]); -#if defined(WIN32) && !defined(__GNUC__) -extern _inline void orbitalparts_set(int *block1, int *block2, int resblock1[], int resblock2[]); -#else -extern inline void orbitalparts_set(int *block1, int *block2, int resblock1[], int resblock2[]); -#endif +void orbitalparts_set(int *block1, int *block2, int resblock1[], int resblock2[]); #endif |
