[commit: base] master: Remove some antiquated C constructs (c85e4df)
Ian Lynagh
igloo at earth.li
Mon Aug 1 03:02:07 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/packages/base
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/c85e4dfa5cbbc3987f549894b0f3f3f5561b8992
>---------------------------------------------------------------
commit c85e4dfa5cbbc3987f549894b0f3f3f5561b8992
Author: Ian Lynagh <igloo at earth.li>
Date: Mon Aug 1 01:08:28 2011 +0100
Remove some antiquated C constructs
Fixes validate on amd64/Linux with:
SRC_CC_OPTS += -Wmissing-parameter-type
SRC_CC_OPTS += -Wold-style-declaration
SRC_CC_OPTS += -Wold-style-definition
>---------------------------------------------------------------
cbits/primFloat.c | 20 ++++++++++----------
include/HsBase.h | 12 ++++++------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/cbits/primFloat.c b/cbits/primFloat.c
index 0e9f9b3..7ac0320 100644
--- a/cbits/primFloat.c
+++ b/cbits/primFloat.c
@@ -445,16 +445,16 @@ rintDouble(HsDouble d)
#else /* ! IEEE_FLOATING_POINT */
/* Dummy definitions of predicates - they all return "normal" values */
-HsInt isDoubleFinite(d) HsDouble d; { return 1;}
-HsInt isDoubleNaN(d) HsDouble d; { return 0; }
-HsInt isDoubleInfinite(d) HsDouble d; { return 0; }
-HsInt isDoubleDenormalized(d) HsDouble d; { return 0; }
-HsInt isDoubleNegativeZero(d) HsDouble d; { return 0; }
-HsInt isFloatFinite(f) HsFloat f; { return 1; }
-HsInt isFloatNaN(f) HsFloat f; { return 0; }
-HsInt isFloatInfinite(f) HsFloat f; { return 0; }
-HsInt isFloatDenormalized(f) HsFloat f; { return 0; }
-HsInt isFloatNegativeZero(f) HsFloat f; { return 0; }
+HsInt isDoubleFinite(HsDouble d) { return 1;}
+HsInt isDoubleNaN(HsDouble d) { return 0; }
+HsInt isDoubleInfinite(HsDouble d) { return 0; }
+HsInt isDoubleDenormalized(HsDouble d) { return 0; }
+HsInt isDoubleNegativeZero(HsDouble d) { return 0; }
+HsInt isFloatFinite(HsFloat f) { return 1; }
+HsInt isFloatNaN(HsFloat f) { return 0; }
+HsInt isFloatInfinite(HsFloat f) { return 0; }
+HsInt isFloatDenormalized(HsFloat f) { return 0; }
+HsInt isFloatNegativeZero(HsFloat f) { return 0; }
/* For exotic floating point formats, we can't do much */
diff --git a/include/HsBase.h b/include/HsBase.h
index c8fabba..a9c19e4 100644
--- a/include/HsBase.h
+++ b/include/HsBase.h
@@ -217,19 +217,19 @@ __hscore_memcpy_src_off( char *dst, char *src, int src_off, size_t sz )
{ return memcpy(dst, src+src_off, sz); }
INLINE HsInt
-__hscore_bufsiz()
+__hscore_bufsiz(void)
{
return BUFSIZ;
}
INLINE int
-__hscore_seek_cur()
+__hscore_seek_cur(void)
{
return SEEK_CUR;
}
INLINE int
-__hscore_o_binary()
+__hscore_o_binary(void)
{
#if defined(_MSC_VER)
return O_BINARY;
@@ -239,7 +239,7 @@ __hscore_o_binary()
}
INLINE int
-__hscore_o_rdonly()
+__hscore_o_rdonly(void)
{
#ifdef O_RDONLY
return O_RDONLY;
@@ -656,12 +656,12 @@ INLINE void setTimevalTicks(struct timeval *p, HsWord64 usecs)
// You should not access _environ directly on Darwin in a bundle/shared library.
// See #2458 and http://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man7/environ.7.html
#include <crt_externs.h>
-INLINE char **__hscore_environ() { return *(_NSGetEnviron()); }
+INLINE char **__hscore_environ(void) { return *(_NSGetEnviron()); }
#else
/* ToDo: write a feature test that doesn't assume 'environ' to
* be in scope at link-time. */
extern char** environ;
-INLINE char **__hscore_environ() { return environ; }
+INLINE char **__hscore_environ(void) { return environ; }
#endif
/* lossless conversions between pointers and integral types */
More information about the Cvs-libraries
mailing list