summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorcremno <[email protected]>2014-01-02 07:33:33 +0100
committercremno <[email protected]>2014-01-02 07:33:33 +0100
commit18433731edff73cc5254a76c86b7272a1430d0f7 (patch)
tree10b527f38066f60aef24a961de5c37ee39dc155b
parente8dd8180baae425c893e1054368a4c32c99ea805 (diff)
downloadmruby-18433731edff73cc5254a76c86b7272a1430d0f7.tar.gz
mruby-18433731edff73cc5254a76c86b7272a1430d0f7.zip
remove various preprocessor conditionals
- HAVE_IEEEFP_H is nowhere defined or needed at all - FreeBSD < 4 is unsupported since years - MSVC workaround (around what exactly?)
-rw-r--r--mrbgems/mruby-sprintf/src/sprintf.c4
-rw-r--r--src/array.c7
-rw-r--r--src/gc.c7
-rw-r--r--src/load.c7
-rw-r--r--src/numeric.c6
-rw-r--r--src/string.c7
6 files changed, 4 insertions, 34 deletions
diff --git a/mrbgems/mruby-sprintf/src/sprintf.c b/mrbgems/mruby-sprintf/src/sprintf.c
index 6479b19bc..5485f5098 100644
--- a/mrbgems/mruby-sprintf/src/sprintf.c
+++ b/mrbgems/mruby-sprintf/src/sprintf.c
@@ -15,10 +15,6 @@
#include <math.h>
#include <ctype.h>
-#ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>
-#endif
-
#define BIT_DIGITS(N) (((N)*146)/485 + 1) /* log2(10) =~ 146/485 */
#define BITSPERDIG (sizeof(mrb_int)*CHAR_BIT)
#define EXTENDSIGN(n, l) (((~0 << (n)) >> (((n)*(l)) % BITSPERDIG)) & ~(~0 << (n)))
diff --git a/src/array.c b/src/array.c
index 0fb257d7e..f9097baa7 100644
--- a/src/array.c
+++ b/src/array.c
@@ -4,12 +4,7 @@
** See Copyright Notice in mruby.h
*/
-#ifndef SIZE_MAX
- /* Some versions of VC++
- * has SIZE_MAX in stdint.h
- */
-# include <limits.h>
-#endif
+#include <limits.h>
#include "mruby.h"
#include "mruby/array.h"
#include "mruby/class.h"
diff --git a/src/gc.c b/src/gc.c
index 5592b48f1..44dcbe468 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -4,12 +4,7 @@
** See Copyright Notice in mruby.h
*/
-#ifndef SIZE_MAX
- /* Some versions of VC++
- * has SIZE_MAX in stdint.h
- */
-# include <limits.h>
-#endif
+#include <limits.h>
#include <string.h>
#include <stdlib.h>
#include "mruby.h"
diff --git a/src/load.c b/src/load.c
index adc2416df..57845b2ca 100644
--- a/src/load.c
+++ b/src/load.c
@@ -4,12 +4,7 @@
** See Copyright Notice in mruby.h
*/
-#ifndef SIZE_MAX
- /* Some versions of VC++
- * has SIZE_MAX in stdint.h
- */
-# include <limits.h>
-#endif
+#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include "mruby/dump.h"
diff --git a/src/numeric.c b/src/numeric.c
index db90d81fb..0b841bf70 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -5,12 +5,6 @@
*/
#include <float.h>
-#if defined(__FreeBSD__) && __FreeBSD__ < 4
-# include <floatingpoint.h>
-#endif
-#ifdef HAVE_IEEEFP_H
-# include <ieeefp.h>
-#endif
#include <limits.h>
#include <math.h>
#include <stdlib.h>
diff --git a/src/string.c b/src/string.c
index 1c577188e..a687a4c29 100644
--- a/src/string.c
+++ b/src/string.c
@@ -5,12 +5,7 @@
*/
#include <ctype.h>
-#ifndef SIZE_MAX
- /* Some versions of VC++
- * has SIZE_MAX in stdint.h
- */
-# include <limits.h>
-#endif
+#include <limits.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>