diff options
| author | Kai Blin <kai@samba.org> | 2007-07-03 06:16:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:53:31 -0500 |
| commit | 170e019044f31b903614fce2ca783a3b9f9f0e2e (patch) | |
| tree | 4efdb13d3efb652e68298f9e940e8045ef503970 | |
| parent | 115b706939acecaf60831195fca8a2912cfdbe55 (diff) | |
| download | samba-170e019044f31b903614fce2ca783a3b9f9f0e2e.tar.gz samba-170e019044f31b903614fce2ca783a3b9f9f0e2e.tar.bz2 samba-170e019044f31b903614fce2ca783a3b9f9f0e2e.zip | |
r23674: Merge changes from Samba 3 SVN r23539:
Avoid code duplication in winbind_nss_linux.h
(This used to be commit e95d258078701c1a15940815652f77b127471267)
| -rw-r--r-- | source4/nsswitch/winbind_nss.h | 3 | ||||
| -rw-r--r-- | source4/nsswitch/winbind_nss_linux.h | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/source4/nsswitch/winbind_nss.h b/source4/nsswitch/winbind_nss.h index 5416ae211e..c7abf77ea0 100644 --- a/source4/nsswitch/winbind_nss.h +++ b/source4/nsswitch/winbind_nss.h @@ -39,8 +39,7 @@ * Linux (glibc) */ -#include <nss.h> -typedef enum nss_status NSS_STATUS; +#include "nsswitch/winbind_nss_linux.h" #elif HAVE_NS_API_H diff --git a/source4/nsswitch/winbind_nss_linux.h b/source4/nsswitch/winbind_nss_linux.h index 1c7e830037..456bfa5c14 100644 --- a/source4/nsswitch/winbind_nss_linux.h +++ b/source4/nsswitch/winbind_nss_linux.h @@ -24,12 +24,8 @@ #ifndef _WINBIND_NSS_LINUX_H #define _WINBIND_NSS_LINUX_H -#if HAVE_NSS_H - #include <nss.h> typedef enum nss_status NSS_STATUS; -#endif /* HAVE_NSS_H */ - #endif /* _WINBIND_NSS_LINUX_H */ |