From 6b3e83338bc49345326790156a7a3498dfceee12 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 25 Jan 2001 18:40:46 +0000
Subject: Update.

	* sysdeps/generic/bits/confname.h: Correct names of _SC_PBS
	constants and add _SC_STREAMS.
	* sysdeps/posix/sysconf.c (__sysconf): Likewise.
---
 sysdeps/generic/bits/confname.h | 26 +++++++++++++++-----------
 sysdeps/posix/sysconf.c         | 23 ++++++++++++++++++-----
 2 files changed, 33 insertions(+), 16 deletions(-)

(limited to 'sysdeps')

diff --git a/sysdeps/generic/bits/confname.h b/sysdeps/generic/bits/confname.h
index 6c3bd7fc2a..7565e495da 100644
--- a/sysdeps/generic/bits/confname.h
+++ b/sysdeps/generic/bits/confname.h
@@ -420,18 +420,22 @@ enum
 #define _SC_USER_GROUPS			_SC_USER_GROUPS
     _SC_USER_GROUPS_R,
 #define _SC_USER_GROUPS_R		_SC_USER_GROUPS_R
-    _SC_PBS,
-#define _SC_PBS				_SC_PBS
-    _SC_PBS_ACCOUNTING,
-#define _SC_PBS_ACCOUNTING		_SC_PBS_ACCOUNTING
-    _SC_PBS_LOCATE,
-#define _SC_PBS_LOCATE			_SC_PBS_LOCATE
-    _SC_PBS_MESSAGE,
-#define _SC_PBS_MESSAGE			_SC_PBS_MESSAGE
-    _SC_PBS_TRACK,
-#define _SC_PBS_TRACK			_SC_PBS_TRACK
-    _SC_SYMLOOP
+    _SC_2_PBS,
+#define _SC_2_PBS			_SC_2_PBS
+    _SC_2_PBS_ACCOUNTING,
+#define _SC_2_PBS_ACCOUNTING		_SC_2_PBS_ACCOUNTING
+    _SC_2_PBS_LOCATE,
+#define _SC_2_PBS_LOCATE		_SC_2_PBS_LOCATE
+    _SC_2_PBS_MESSAGE,
+#define _SC_2_PBS_MESSAGE		_SC_2_PBS_MESSAGE
+    _SC_2_PBS_TRACK,
+#define _SC_2_PBS_TRACK			_SC_2_PBS_TRACK
+    _SC_SYMLOOP,
 #define _SC_SYMLOOP			_SC_SYMLOOP
+    _SC_STREAMS,
+#define _SC_STREAMS			_SC_STREAMS
+    _SC_2_PBS_CHECKPOINT
+#define _SC_2_PBS_CHECKPOINT		_SC_2_PBS_CHECKPOINT
   };
 
 #if (defined __USE_POSIX2 || defined __USE_UNIX98 \
diff --git a/sysdeps/posix/sysconf.c b/sysdeps/posix/sysconf.c
index 616c950898..7faaa51f94 100644
--- a/sysdeps/posix/sysconf.c
+++ b/sysdeps/posix/sysconf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 93, 95, 96, 97, 99, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991,93,95,96,97,99,2000,2001 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
@@ -1053,25 +1053,31 @@ __sysconf (name)
       return -1;
 #endif
 
-    case _SC_PBS:
+    case _SC_2_PBS:
 #ifdef _POSIX2_PBS
       return _POSIX2_PBS;
 #else
       return -1;
 #endif
-    case _SC_PBS_ACCOUNTING:
+    case _SC_2_PBS_ACCOUNTING:
 #ifdef _POSIX2_PBS_ACCOUNTING
       return _POSIX2_PBS_ACCOUNTING;
 #else
       return -1;
 #endif
-    case _SC_PBS_LOCATE:
+    case _SC_2_PBS_CHECKPOINT:
+#ifdef _POSIX2_PBS_CHECKPOINT
+      return _POSIX2_PBS_CHECKPOINT;
+#else
+      return -1;
+#endif
+    case _SC_2_PBS_LOCATE:
 #ifdef _POSIX2_PBS_LOCATE
       return _POSIX2_PBS_LOCATE;
 #else
       return -1;
 #endif
-    case _SC_PBS_TRACK:
+    case _SC_2_PBS_TRACK:
 #ifdef _POSIX2_PBS_TRACK
       return _POSIX2_PBS_TRACK;
 #else
@@ -1084,6 +1090,13 @@ __sysconf (name)
 #else
       return -1;
 #endif
+
+    case _SC_STREAMS:
+#ifdef _XOPEN_STREAMS
+      return _XOPEN_STREAMS;
+#else
+      return -1;
+#endif
     }
 }
 
-- 
cgit v1.2.3