Author: kai Date: 2007-07-03 06:16:44 +0000 (Tue, 03 Jul 2007) New Revision: 23674
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23674 Log: Merge changes from Samba 3 SVN r23539: Avoid code duplication in winbind_nss_linux.h Modified: branches/SAMBA_4_0/source/nsswitch/winbind_nss.h branches/SAMBA_4_0/source/nsswitch/winbind_nss_linux.h Changeset: Modified: branches/SAMBA_4_0/source/nsswitch/winbind_nss.h =================================================================== --- branches/SAMBA_4_0/source/nsswitch/winbind_nss.h 2007-07-02 20:51:09 UTC (rev 23673) +++ branches/SAMBA_4_0/source/nsswitch/winbind_nss.h 2007-07-03 06:16:44 UTC (rev 23674) @@ -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 Modified: branches/SAMBA_4_0/source/nsswitch/winbind_nss_linux.h =================================================================== --- branches/SAMBA_4_0/source/nsswitch/winbind_nss_linux.h 2007-07-02 20:51:09 UTC (rev 23673) +++ branches/SAMBA_4_0/source/nsswitch/winbind_nss_linux.h 2007-07-03 06:16:44 UTC (rev 23674) @@ -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 */
