summary refs log tree commit diff
path: root/locale/locale.h
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-02-25 01:23:32 +0000
committerRoland McGrath <roland@gnu.org>1995-02-25 01:23:32 +0000
commit22a1292a42facff7597f3336a91eea57db9709e6 (patch)
tree90182d921edc7ecb39254237386f7a2a07d7e64b /locale/locale.h
parente66f63fb6364729aad510f5b3feb8a046775ec1a (diff)
downloadglibc-22a1292a42facff7597f3336a91eea57db9709e6.tar.gz
glibc-22a1292a42facff7597f3336a91eea57db9709e6.tar.xz
glibc-22a1292a42facff7597f3336a91eea57db9709e6.zip
* io/Makefile (routines): Add euidaccess.
	* sysdeps/mach/hurd/euidaccess.c: New file.
	* sysdeps/stub/euidaccess.c: New file.
	* posix/unistd.h [__USE_GNU] (euidaccess): Declare it.

	* dirent/Makefile (routines): Add dirfd.
	* sysdeps/stub/dirfd.c: New file.
	* sysdeps/unix/dirfd.c: New file.
	* sysdeps/unix/dirstream.h (_DIR_dirfd): New macro.
	* dirent/dirent.h (dirfd): Declare new function.  Define as macro
 	_DIR_dirfd if that is defined.
	* sysdeps/mach/hurd/dirstream.h (DIR): Replace `__port' member
 	with `void *__fd'.
	* sysdeps/mach/hurd/opendir.c: Use DIRP->__fd instead of DIRP->__port.
	Open the file with `open'; set FD_CLOEXEC on the fd.
	* sysdeps/mach/hurd/closedir.c: Likewise.
	* sysdeps/mach/hurd/readdir.c: Likewise.
	* sysdeps/mach/hurd/dirfd.c: New file.

	* posix/Makefile (glob/configure): Do cvs commit if there is a CVS
 	directory.
	(glob/ChangeLog): Likewise.

	* locale/locale.h (LC_*): Use small integers instead of bit masks.
Diffstat (limited to 'locale/locale.h')
-rw-r--r--locale/locale.h20
1 files changed, 9 insertions, 11 deletions
diff --git a/locale/locale.h b/locale/locale.h
index 80f9f90e7b..1fc867a9d4 100644
--- a/locale/locale.h
+++ b/locale/locale.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995 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
@@ -28,16 +28,14 @@ Cambridge, MA 02139, USA.  */
 __BEGIN_DECLS
 
 /* These are the possibilities for the first argument to setlocale.
-   Note that although they are bit masks, they cannot be OR'd together
-   to form a new argument to pass.  They must be used one at a time.  */
-#define	LC_COLLATE	(1 << 0)
-#define	LC_CTYPE	(1 << 1)
-#define	LC_MONETARY	(1 << 2)
-#define	LC_NUMERIC	(1 << 3)
-#define	LC_TIME		(1 << 4)
-#define	LC_RESPONSE	(1 << 5)
-#define	LC_ALL		(LC_COLLATE|LC_CTYPE|LC_MONETARY|LC_NUMERIC|LC_TIME|\
-			 LC_RESPONSE)
+   The code assumes that LC_ALL is the highest value, and zero the lowest.  */
+#define	LC_COLLATE	0
+#define	LC_CTYPE	1
+#define	LC_MONETARY	2
+#define	LC_NUMERIC	3
+#define	LC_TIME		4
+#define	LC_MESSAGES	5
+#define	LC_ALL		6
 
 
 /* Structure giving information about numeric and monetary notation.  */