sync with 2.2

added multiple include protection
added IRIX defines
(This used to be commit b9dbb38bf2d1fbe1ca5d0aa53b89f76844d6209c)

diff --git a/source3/nsswitch/nss.h b/source3/nsswitch/nss.h
index 6995305b93f7aa5605f8fe2ee4479932a3738866..a29271529fd817571e7ce8f67441c54877a2ba82 100644 (file)
--- a/source3/nsswitch/nss.h
+++ b/source3/nsswitch/nss.h
@@ -1,3 +1,5 @@
+#ifndef _NSSWITCH_NSS_H
+#define _NSSWITCH_NSS_H
 /* 
    Unix SMB/Netbios implementation.
    Version 2.0
@@ -46,6 +48,31 @@ typedef nss_status_t NSS_STATUS;
 
 typedef enum nss_status NSS_STATUS;
 
+#elif HAVE_NS_API_H
+
+/* SGI IRIX */
+
+/* following required to prevent warnings of double definition
+ * of datum from ns_api.h
+*/
+#ifdef DATUM
+#define _DATUM_DEFINED
+#endif
+
+#include <ns_api.h>
+
+typedef enum
+{
+  NSS_STATUS_SUCCESS=NS_SUCCESS,
+  NSS_STATUS_NOTFOUND=NS_NOTFOUND,
+  NSS_STATUS_UNAVAIL=NS_UNAVAIL,
+  NSS_STATUS_TRYAGAIN=NS_TRYAGAIN
+} NSS_STATUS;
+
+#define NSD_MEM_STATIC 0
+#define NSD_MEM_VOLATILE 1
+#define NSD_MEM_DYNAMIC 2
+
 #else /* Nothing's defined. Neither gnu nor sun */
 
 typedef enum
@@ -58,3 +85,5 @@ typedef enum
 
 #endif
 
+#endif /* _NSSWITCH_NSS_H */
+