Index: server/common/oursrc/nss_nonlocal/nsswitch-internal.h
===================================================================
--- server/common/oursrc/nss_nonlocal/nsswitch-internal.h	(revision 750)
+++ server/common/oursrc/nss_nonlocal/nsswitch-internal.h	(revision 782)
@@ -7,20 +7,28 @@
 #define NSSWITCH_INTERNAL_H
 
+#include "config.h"
+
+/* glibc/config.h.in */
+#if defined USE_REGPARMS && !defined PROF && !defined __BOUNDED_POINTERS__
+# define internal_function __attribute__ ((regparm (3), stdcall))
+#else
+# define internal_function
+#endif
+
+/* glibc/nss/nsswitch.h */
 typedef struct service_user service_user;
 
-extern int
-__nss_next (service_user **ni, const char *fct_name, void **fctp, int status,
-            int all_values);
+extern int __nss_next (service_user **ni, const char *fct_name, void **fctp,
+		       int status, int all_values);
+extern int __nss_database_lookup (const char *database,
+				  const char *alternative_name,
+				  const char *defconfig, service_user **ni);
+extern void *__nss_lookup_function (service_user *ni, const char *fct_name);
 
-extern int
-__nss_database_lookup (const char *database,
-		       const char *alternative_name,
-		       const char *defconfig, service_user **ni);
-
-extern int
-__nss_configure_lookup (const char *dbname, const char *service_line);
-
-extern void
-*__nss_lookup_function (service_user *ni, const char *fct_name);
+/* glibc/nss/XXX-lookup.c */
+extern int __nss_passwd_lookup (service_user **ni, const char *fct_name,
+				void **fctp) internal_function;
+extern int __nss_group_lookup (service_user **ni, const char *fct_name,
+			        void **fctp) internal_function;
 
 #endif /* NSSWITCH_INTERNAL_H */