diff options
| author | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-06-01 05:53:31 +0000 |
|---|---|---|
| committer | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-06-01 05:53:31 +0000 |
| commit | a8ce53cdba68bb6092e5b92ce5ccfe718617bd26 (patch) | |
| tree | 63fe8083057cc04125b9f153960462ad7b09fd6b /libgfortran/io | |
| parent | 241098f1407329f1349e7453b31db408cc4d0d93 (diff) | |
| download | gcc-a8ce53cdba68bb6092e5b92ce5ccfe718617bd26.tar.gz | |
2012-06-01 Tobias Burnus <burnus@net-b.de>
* intrinsics/chmod.c (chmod_func): On MinGW, don't set is_dir
* and
fix octal-mode handling.
* io/unit.c (get_internal_unit): Add cast.
* io/unix.c (min): Undef "min" before defining it.
* runtime/backtrace.c (show_backtrace): Move label into
ifndef __MINGW__ block.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@188098 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran/io')
| -rw-r--r-- | libgfortran/io/unit.c | 3 | ||||
| -rw-r--r-- | libgfortran/io/unix.c | 20 |
2 files changed, 14 insertions, 9 deletions
diff --git a/libgfortran/io/unit.c b/libgfortran/io/unit.c index 911521d5df7..8b0926d63d3 100644 --- a/libgfortran/io/unit.c +++ b/libgfortran/io/unit.c @@ -430,7 +430,8 @@ get_internal_unit (st_parameter_dt *dtp) else { dtp->internal_unit_len = - string_len_trim_char4 (dtp->internal_unit_len, dtp->internal_unit); + string_len_trim_char4 (dtp->internal_unit_len, + (const gfc_char4_t*) dtp->internal_unit); iunit->recl = dtp->internal_unit_len; } } diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c index c81163f2563..1a9faea486e 100644 --- a/libgfortran/io/unix.c +++ b/libgfortran/io/unix.c @@ -41,13 +41,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include <errno.h> -/* min macro that evaluates its arguments only once. */ -#define min(a,b) \ - ({ typeof (a) _a = (a); \ - typeof (b) _b = (b); \ - _a < _b ? _a : _b; }) - - /* For mingw, we don't identify files by their inode number, but by a 64-bit identifier created from a BY_HANDLE_FILE_INFORMATION. */ #ifdef __MINGW32__ @@ -106,8 +99,19 @@ id_from_fd (const int fd) return id_from_handle ((HANDLE) _get_osfhandle (fd)); } +#endif /* HAVE_WORKING_STAT */ +#endif /* __MINGW32__ */ + + +/* min macro that evaluates its arguments only once. */ +#ifdef min +#undef min #endif -#endif + +#define min(a,b) \ + ({ typeof (a) _a = (a); \ + typeof (b) _b = (b); \ + _a < _b ? _a : _b; }) #ifndef PATH_MAX #define PATH_MAX 1024 |