about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>1998-01-26 22:52:51 +0000
committerRichard Henderson <rth@redhat.com>1998-01-26 22:52:51 +0000
commit687adf1dd0fb7dfa5aedf296108380e02fd89f90 (patch)
treeb5c7334149b25b9cf6d92147ed3bd3e1480a2438
parent0b833ff44bd66007da7f86aa98cc87519d31e1e3 (diff)
downloadglibc-687adf1dd0fb7dfa5aedf296108380e02fd89f90.tar.gz
glibc-687adf1dd0fb7dfa5aedf296108380e02fd89f90.tar.xz
glibc-687adf1dd0fb7dfa5aedf296108380e02fd89f90.zip
* sysdeps/unix/sysv/linux/alpha/bits/mman.h: Dyke out the unimplemented OSF/1 definitions so that they are not accidentally seen.
	* sysdeps/unix/sysv/linux/alpha/bits/mman.h: Dyke out the
	unimplemented OSF/1 definitions so that they are not accidentally seen.
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/mman.h8
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d4c94003eb..79e01b099c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1998-01-26  Richard Henderson  <rth@cygnus.com>
 
+	* sysdeps/unix/sysv/linux/alpha/bits/mman.h: Dyke out the
+	unimplemented OSF/1 definitions so that they are not accidentally seen.
+
 	* sysdeps/alpha/dl-machine.h (TRAMPOLINE_TEMPLATE): Move declaration
 	of the trampoline function into the macro.
 	* sysdeps/unix/sysv/linux/alpha/clone.S: Fix ldgp for PROF.
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/mman.h b/sysdeps/unix/sysv/linux/alpha/bits/mman.h
index 081a00441e..1411c85831 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/mman.h
@@ -1,5 +1,5 @@
 /* Definitions for POSIX memory map interface.  Linux/Alpha version.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -50,9 +50,9 @@
 # define MAP_ANON	  MAP_ANONYMOUS
 #endif
 
-/* Not used by Linux, but here to make sure we don't clash with OSF/1
-   defines.  */
-#ifdef __USE_BSD
+/* Not used by Linux, but here to make sure we don't clash with
+   OSF/1 defines.  */
+#if 0 && defined(__USE_BSD)
 # define MAP_HASSEMAPHORE 0x0200
 # define MAP_INHERIT	  0x0400
 # define MAP_UNALIGNED	  0x0800