aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/scanner.c
diff options
context:
space:
mode:
authorJanne Blomqvist <jb@gcc.gnu.org>2013-04-17 13:19:40 +0300
committerJanne Blomqvist <jb@gcc.gnu.org>2013-04-17 13:19:40 +0300
commit070edbc29c4f4a716cc6f4d9b038c9f38f9300a0 (patch)
treebdc067d3b77ecfbdb6d53c500ae6f5cefa3c906d /gcc/fortran/scanner.c
parent10a883113b6d5657efeb9d3eedef1a13f97185f3 (diff)
downloadgcc-070edbc29c4f4a716cc6f4d9b038c9f38f9300a0.zip
gcc-070edbc29c4f4a716cc6f4d9b038c9f38f9300a0.tar.gz
gcc-070edbc29c4f4a716cc6f4d9b038c9f38f9300a0.tar.bz2
PR 40958 Compress module files with zlib.
frontend ChangeLog: 2013-04-17 Janne Blomqvist <jb@gcc.gnu.org> PR fortran/40958 * scanner.h: New file. * Make-lang.in: Dependencies on scanner.h. * scanner.c (gfc_directorylist): Move to scanner.h. * module.c: Don't include md5.h, include scanner.h and zlib.h. (MOD_VERSION): Add comment about backwards compatibility. (module_fp): Change type to gzFile. (ctx): Remove. (gzopen_included_file_1): New function. (gzopen_included_file): New function. (gzopen_intrinsic_module): New function. (write_char): Use gzputc. (read_crc32_from_module_file): New function. (read_md5_from_module_file): Remove. (gfc_dump_module): Use gz* functions instead of stdio, check gzip crc32 instead of md5. (read_module_to_tmpbuf): Use gz* functions instead of stdio. (gfc_use_module): Use gz* functions. testsuite ChangeLog: 2013-04-17 Janne Blomqvist <jb@gcc.gnu.org> PR fortran/40958 * lib/gcc-dg.exp (scan-module): Uncompress module file before scanning. * gfortran.dg/module_md5_1.f90: Remove. From-SVN: r198023
Diffstat (limited to 'gcc/fortran/scanner.c')
-rw-r--r--gcc/fortran/scanner.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c
index fd8f284..882e2d5 100644
--- a/gcc/fortran/scanner.c
+++ b/gcc/fortran/scanner.c
@@ -48,18 +48,10 @@ along with GCC; see the file COPYING3. If not see
#include "debug.h"
#include "flags.h"
#include "cpp.h"
-
-/* Structure for holding module and include file search path. */
-typedef struct gfc_directorylist
-{
- char *path;
- bool use_for_modules;
- struct gfc_directorylist *next;
-}
-gfc_directorylist;
+#include "scanner.h"
/* List of include file search directories. */
-static gfc_directorylist *include_dirs, *intrinsic_modules_dirs;
+gfc_directorylist *include_dirs, *intrinsic_modules_dirs;
static gfc_file *file_head, *current_file;