diff options
| author | Zack Weinberg <zack@wolery.cumb.org> | 2000-04-17 17:25:57 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2000-04-17 17:25:57 +0000 |
| commit | 56f02b88c17ac5e93b999eb556d75a7c2f95d232 (patch) | |
| tree | f937ac865b7e421b193a33b4b32088ee5560ba72 /gcc/intl/loadmsgcat.c | |
| parent | 994a57cd287e37aaaf909fc1ae671e54b1b360c4 (diff) | |
| download | gcc-56f02b88c17ac5e93b999eb556d75a7c2f95d232.zip gcc-56f02b88c17ac5e93b999eb556d75a7c2f95d232.tar.gz gcc-56f02b88c17ac5e93b999eb556d75a7c2f95d232.tar.bz2 | |
aclocal.m4 (AM_GNU_GETTEXT): Don't AC_REQUIRE([AC_FUNC_MMAP]).
* aclocal.m4 (AM_GNU_GETTEXT): Don't AC_REQUIRE([AC_FUNC_MMAP]).
(AC_FUNC_MMAP_FILE): New macro, tests read-only private map of
a plain file.
* configure.in: Call AC_FUNC_MMAP_FILE.
* configure: Regenerate.
* config.in: Regenerate.
* intl/loadmsgcat.c: Test HAVE_MMAP_FILE not HAVE_MMAP.
* fixinc/fixincl.c: Likewise.
From-SVN: r33212
Diffstat (limited to 'gcc/intl/loadmsgcat.c')
| -rw-r--r-- | gcc/intl/loadmsgcat.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/intl/loadmsgcat.c b/gcc/intl/loadmsgcat.c index 515892d..4dfb687 100644 --- a/gcc/intl/loadmsgcat.c +++ b/gcc/intl/loadmsgcat.c @@ -31,7 +31,7 @@ # include <unistd.h> #endif -#if (defined HAVE_MMAP && defined HAVE_MUNMAP) || defined _LIBC +#if defined HAVE_MMAP_FILE || defined _LIBC # include <sys/mman.h> #endif @@ -68,7 +68,7 @@ _nl_load_domain (domain_file) size_t size; struct stat st; struct mo_file_header *data = (struct mo_file_header *) -1; -#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ +#if (defined HAVE_MMAP_FILE && !defined DISALLOW_MMAP) \ || defined _LIBC int use_mmap = 0; #endif @@ -99,7 +99,7 @@ _nl_load_domain (domain_file) return; } -#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ +#if (defined HAVE_MMAP_FILE && !defined DISALLOW_MMAP) \ || defined _LIBC /* Now we are ready to load the file. If mmap() is available we try this first. If not available or it failed we try to load it. */ @@ -149,7 +149,7 @@ _nl_load_domain (domain_file) if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED) { /* The magic number is wrong: not a message catalog file. */ -#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ +#if (defined HAVE_MMAP_FILE && !defined DISALLOW_MMAP) \ || defined _LIBC if (use_mmap) munmap ((caddr_t) data, size); @@ -166,7 +166,7 @@ _nl_load_domain (domain_file) domain = (struct loaded_domain *) domain_file->data; domain->data = (char *) data; -#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ +#if (defined HAVE_MMAP_FILE && !defined DISALLOW_MMAP) \ || defined _LIBC domain->use_mmap = use_mmap; #endif @@ -188,7 +188,7 @@ _nl_load_domain (domain_file) break; default: /* This is an illegal revision. */ -#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ +#if (defined HAVE_MMAP_FILE && !defined DISALLOW_MMAP) \ || defined _LIBC if (use_mmap) munmap ((caddr_t) data, size); |