projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2001-05-03 08:09:52 by simonpj]
[ghc-hetmet.git]
/
ghc
/
rts
/
RtsUtils.c
diff --git
a/ghc/rts/RtsUtils.c
b/ghc/rts/RtsUtils.c
index
23bf0d6
..
1967290
100644
(file)
--- a/
ghc/rts/RtsUtils.c
+++ b/
ghc/rts/RtsUtils.c
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: RtsUtils.c,v 1.15 2000/04/14 14:07:43 simonmar Exp $
+ * $Id: RtsUtils.c,v 1.18 2001/02/13 11:10:28 rrt Exp $
*
* (c) The GHC Team, 1998-1999
*
*
* (c) The GHC Team, 1998-1999
*
@@
-115,8
+115,9
@@
stgReallocWords (void *p, int n, char *msg)
void
_stgAssert (char *filename, nat linenum)
{
void
_stgAssert (char *filename, nat linenum)
{
- /* don't fflush(stdout); WORKAROUND bug in Linux glibc */
+ fflush(stdout);
fprintf(stderr, "ASSERTION FAILED: file %s, line %u\n", filename, linenum);
fprintf(stderr, "ASSERTION FAILED: file %s, line %u\n", filename, linenum);
+ fflush(stderr);
abort();
}
abort();
}
@@
-218,7
+219,7
@@
resetNonBlockingFd(int fd)
{
long fd_flags;
{
long fd_flags;
-#if !defined(_WIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if !defined(mingw32_TARGET_OS)
/* clear the non-blocking flag on this file descriptor */
fd_flags = fcntl(fd, F_GETFL);
if (fd_flags & O_NONBLOCK) {
/* clear the non-blocking flag on this file descriptor */
fd_flags = fcntl(fd, F_GETFL);
if (fd_flags & O_NONBLOCK) {
@@
-233,7
+234,7
@@
static ullong startTime = 0;
ullong
msTime(void)
{
ullong
msTime(void)
{
-# if defined(HAVE_GETCLOCK) && !defined(alpha_TARGET_ARCH)
+# if defined(HAVE_GETCLOCK) && !defined(alpha_TARGET_ARCH) && !defined(hppa1_1_TARGET_ARCH)
struct timespec tv;
if (getclock(TIMEOFDAY, &tv) != 0) {
struct timespec tv;
if (getclock(TIMEOFDAY, &tv) != 0) {