[gomp] Tiny merge fixes for libgfortran
Jakub Jelinek
jakub@redhat.com
Wed Oct 26 03:44:00 GMT 2005
Hi!
1) on gomp branch, -D_GNU_SOURCE is already in the Makefile. As is
in fpu.c it doesn't do anything anyway, since HAVE_FENV_H is something
defined just in config.h which hasn't been included at that point yet.
2) a warning fix for find_file
2005-10-25 Jakub Jelinek <jakub@redhat.com>
* runtime/fpu.c (_GNU_SOURCE): Don't define here.
* io/unix.c (find_file): Pass &st[0] to stat instead of &st.
--- libgfortran/runtime/fpu.c.jj 2005-10-25 22:15:11.000000000 +0200
+++ libgfortran/runtime/fpu.c 2005-10-25 22:53:00.000000000 +0200
@@ -1,8 +1,3 @@
-/* This is needed for fpu-glibc.h, before all other includes */
-#ifdef HAVE_FENV_H && !defined _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
#include "libgfortran.h"
/* We include the platform-dependent code. */
--- libgfortran/io/unix.c.jj 2005-10-25 22:53:42.000000000 +0200
+++ libgfortran/io/unix.c 2005-10-25 22:53:42.000000000 +0200
@@ -1342,7 +1342,7 @@ find_file (const char *file, gfc_charlen
if (unpack_filename (path, file, file_len))
return NULL;
- if (stat (path, &st) < 0)
+ if (stat (path, &st[0]) < 0)
return NULL;
__gthread_mutex_lock (&unit_lock);
Jakub
More information about the Fortran
mailing list