From bea9b19322c77265033a068ac60c95a37e798a80 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Mon, 30 Jul 2012 16:09:11 -0700
Subject: Fix lots of bitrot for stub configurations.

---
 nss/makedb.c                     | 1 +
 nss/nss_db/db-initgroups.c       | 1 +
 nss/nss_db/db-netgrp.c           | 3 ++-
 nss/nss_files/files-initgroups.c | 4 +++-
 nss/nsswitch.c                   | 4 ++++
 5 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'nss')

diff --git a/nss/makedb.c b/nss/makedb.c
index 5890c054f0..ccaabdff95 100644
--- a/nss/makedb.c
+++ b/nss/makedb.c
@@ -27,6 +27,7 @@
 #include <libintl.h>
 #include <locale.h>
 #include <search.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/nss/nss_db/db-initgroups.c b/nss/nss_db/db-initgroups.c
index 16eb8e2d82..2e2e3f284b 100644
--- a/nss/nss_db/db-initgroups.c
+++ b/nss/nss_db/db-initgroups.c
@@ -22,6 +22,7 @@
 #include <grp.h>
 #include <limits.h>
 #include <paths.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/param.h>
 
diff --git a/nss/nss_db/db-netgrp.c b/nss/nss_db/db-netgrp.c
index 37705b05a1..3c18ea8305 100644
--- a/nss/nss_db/db-netgrp.c
+++ b/nss/nss_db/db-netgrp.c
@@ -1,5 +1,5 @@
 /* Netgroup file parser in nss_db modules.
-   Copyright (C) 1996, 1997, 1999, 2000, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <bits/libc-lock.h>
 #include <paths.h>
+#include <stdlib.h>
 
 #include "nsswitch.h"
 #include "nss_db.h"
diff --git a/nss/nss_files/files-initgroups.c b/nss/nss_files/files-initgroups.c
index c8ce0656af..a5a2164eb3 100644
--- a/nss/nss_files/files-initgroups.c
+++ b/nss/nss_files/files-initgroups.c
@@ -1,5 +1,5 @@
 /* Initgroups handling in nss_files module.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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
@@ -23,6 +23,8 @@
 #include <stdio_ext.h>
 #include <string.h>
 #include <sys/param.h>
+#include <stdbool.h>
+#include <stdlib.h>
 
 enum nss_status
 _nss_files_initgroups_dyn (const char *user, gid_t group, long int *start,
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 464f478d2b..a2628c747c 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -415,7 +415,9 @@ __nss_lookup_function (service_user *ni, const char *fct_name)
     {
       /* The search found an existing structure in the tree.  */
       result = ((known_function *) *found)->fct_ptr;
+#ifdef PTR_DEMANGLE
       PTR_DEMANGLE (result);
+#endif
     }
   else
     {
@@ -503,7 +505,9 @@ __nss_lookup_function (service_user *ni, const char *fct_name)
 	  /* Remember function pointer for later calls.  Even if null, we
 	     record it so a second try needn't search the library again.  */
 	  known->fct_ptr = result;
+#ifdef PTR_MANGLE
 	  PTR_MANGLE (known->fct_ptr);
+#endif
 	}
     }
 
-- 
cgit v1.2.3