More magic

diff --git a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/bits/types.h b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/bits/types.h
index bcbe7a3..3b53398 100644 (file)
--- a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/bits/types.h
+++ b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/bits/types.h
@@ -232,7 +232,7 @@ typedef __t_uscalar_t       t_uscalar_t;
 #endif
 typedef __t_scalar_t   t_scalar_t;
 
-#if defined(_XOPEN_SOURCE) || defined(_POSIX_C_SOURCE)
+#ifdef __USE_POSIX
 typedef enum
   {
        _B_FALSE,

diff --git a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/priv.c b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/priv.c
index 7c01b73..184cb7e 100644 (file)
--- a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/priv.c
+++ b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/priv.c
@@ -235,8 +235,8 @@ boolean_t priv_isemptyset (const priv_set_t *sp)
   priv_chunk_t *pcsp = (priv_chunk_t *)sp;
   for (int i = 0; i < __PRIVSETCHUNKS; i++)
     if (pcsp[i])
-      return B_FALSE;
-  return B_TRUE;
+      return _B_FALSE;
+  return _B_TRUE;
 }
 
 
@@ -245,8 +245,8 @@ boolean_t priv_isfullset (const priv_set_t *sp)
   priv_chunk_t *pcsp = (priv_chunk_t *)sp;
   for (int i = 0; i < __PRIVSETCHUNKS; i++)
     if (~pcsp[i])
-      return B_FALSE;
-  return B_TRUE;
+      return _B_FALSE;
+  return _B_TRUE;
 }
 
 
@@ -254,10 +254,10 @@ boolean_t priv_ismember (const priv_set_t *sp, const char *priv)
 {
   int privn = priv_getbyname (priv);
   if (privn == -1)
-    return B_FALSE;
+    return _B_FALSE;
 
   return (((priv_chunk_t *)sp)[__PRIVELT (privn)] & __PRIVMASK (privn)) ?
-      B_TRUE : B_FALSE;
+      _B_TRUE : _B_FALSE;
 }
 
 
@@ -267,8 +267,8 @@ boolean_t priv_issubset (const priv_set_t *src, const priv_set_t *dst)
   priv_chunk_t *pcdst = (priv_chunk_t *)dst;
   for (int i = 0; i < __PRIVSETCHUNKS; i++)
     if ((pcsrc[__PRIVELT (i)] & pcdst[__PRIVELT (i)]) != pcsrc[__PRIVELT (i)])
-      return B_FALSE;
-  return B_TRUE;
+      return _B_FALSE;
+  return _B_TRUE;
 }
 
 
@@ -312,11 +312,11 @@ boolean_t priv_ineffect (const char *priv)
 {
   priv_set_t *pset = priv_allocset ();
   if (!pset)
-    return B_FALSE;
+    return _B_FALSE;
 
   int res = getppriv (PRIV_EFFECTIVE, pset);
   if (res == -1)
-    return B_FALSE;
+    return _B_FALSE;
 
   boolean_t ret = priv_ismember (pset, priv);