From 76c0a846a59a1fc05aa6a2a975287e9ce9b16476 Mon Sep 17 00:00:00 2001 From: fxcoudert Date: Wed, 17 Jan 2007 19:44:00 +0000 Subject: PR libfortran/27107 * runtime/environ.c: Don't include io/io.h. * runtime/string.c: Don't include io/io.h. (compare0): Add cast to avoid warning. * runtime/error.c: Don't include io/io.h. (st_printf): Move to io/unix.c. * intrinsics/flush.c: Delete, contents moved to io/intrinsics.c. * intrinsics/fget.c: Likewise. * intrinsics/ftell.c: Likewise. * intrinsics/tty.c: Likewise. * libgfortran.h (DEFAULT_RECL, notification_std, get_unformatted_convert, IOPARM_*, st_parameter_common, unit_convert, DEFAULT_TEMPDIR): New declarations. * io/io.h (DEFAULT_RECL, notification_std, get_unformatted_convert, IOPARM_*, st_parameter_common, unit_convert, DEFAULT_TEMPDIR): Move to libgfortran.h. * io/unix.c: Add io/unix.h content. (st_printf): New function. * io/intrinsics.c: New file. * io/unix.h: Remove, contents moved into unix.c. * libtool-version: Update library version to 3.0.0. * configure.ac: Update library version to 0.3. * Makefile.am (intrinsics/fget.c, intrinsics/flush.c, intrinsics/ftell.c, intrinsics/tty.c, libgfortran.h): Remove targets. * Makefile.in: Regenerate. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120869 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgfortran/io/io.h | 57 ----------------------------------------------------- 1 file changed, 57 deletions(-) (limited to 'libgfortran/io/io.h') diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h index 314fc4cc818..8d8d592d40b 100644 --- a/libgfortran/io/io.h +++ b/libgfortran/io/io.h @@ -35,8 +35,6 @@ Boston, MA 02110-1301, USA. */ #include -#define DEFAULT_TEMPDIR "/tmp" - /* Basic types used in data transfers. */ typedef enum @@ -205,10 +203,6 @@ typedef enum {READING, WRITING} unit_mode; -typedef enum -{ CONVERT_NONE=-1, CONVERT_NATIVE, CONVERT_SWAP, CONVERT_BIG, CONVERT_LITTLE } -unit_convert; - #define CHARACTER1(name) \ char * name; \ gfc_charlen_type name ## _len @@ -216,42 +210,6 @@ unit_convert; gfc_charlen_type name ## _len; \ char * name -#define IOPARM_LIBRETURN_MASK (3 << 0) -#define IOPARM_LIBRETURN_OK (0 << 0) -#define IOPARM_LIBRETURN_ERROR (1 << 0) -#define IOPARM_LIBRETURN_END (2 << 0) -#define IOPARM_LIBRETURN_EOR (3 << 0) -#define IOPARM_ERR (1 << 2) -#define IOPARM_END (1 << 3) -#define IOPARM_EOR (1 << 4) -#define IOPARM_HAS_IOSTAT (1 << 5) -#define IOPARM_HAS_IOMSG (1 << 6) - -#define IOPARM_COMMON_MASK ((1 << 7) - 1) - -typedef struct st_parameter_common -{ - GFC_INTEGER_4 flags; - GFC_INTEGER_4 unit; - const char *filename; - GFC_INTEGER_4 line; - CHARACTER2 (iomsg); - GFC_INTEGER_4 *iostat; -} -st_parameter_common; - -#define IOPARM_OPEN_HAS_RECL_IN (1 << 7) -#define IOPARM_OPEN_HAS_FILE (1 << 8) -#define IOPARM_OPEN_HAS_STATUS (1 << 9) -#define IOPARM_OPEN_HAS_ACCESS (1 << 10) -#define IOPARM_OPEN_HAS_FORM (1 << 11) -#define IOPARM_OPEN_HAS_BLANK (1 << 12) -#define IOPARM_OPEN_HAS_POSITION (1 << 13) -#define IOPARM_OPEN_HAS_ACTION (1 << 14) -#define IOPARM_OPEN_HAS_DELIM (1 << 15) -#define IOPARM_OPEN_HAS_PAD (1 << 16) -#define IOPARM_OPEN_HAS_CONVERT (1 << 17) - typedef struct { st_parameter_common common; @@ -475,13 +433,6 @@ typedef struct unit_flags; -/* The default value of record length for preconnected units is defined - here. This value can be overriden by an environment variable. - Default value is 1 Gb. */ - -#define DEFAULT_RECL 1073741824 - - typedef struct gfc_unit { int unit_number; @@ -877,10 +828,6 @@ extern void list_formatted_write (st_parameter_dt *, bt, void *, int, size_t, size_t); internal_proto(list_formatted_write); -/* error.c */ -extern notification notification_std(int); -internal_proto(notification_std); - /* size_from_kind.c */ extern size_t size_from_real_kind (int); internal_proto(size_from_real_kind); @@ -926,7 +873,3 @@ dec_waiting_unlocked (gfc_unit *u) #endif -/* ../runtime/environ.c This is here because we return unit_convert. */ - -unit_convert get_unformatted_convert (int); -internal_proto(get_unformatted_convert); -- cgit v1.2.1