diff options
| author | Tim Potter <tpot@samba.org> | 2001-08-01 07:05:36 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2001-08-01 07:05:36 +0000 |
| commit | 9dd54f9bde9d8f3f830f45670e97727f6679acca (patch) | |
| tree | 938deaa8860e0ba7ca3eefb50985cf30acdc6cde | |
| parent | 168efc7c6de49948fc16fc0fe7070dd6ddead4eb (diff) | |
| download | samba-9dd54f9bde9d8f3f830f45670e97727f6679acca.tar.gz samba-9dd54f9bde9d8f3f830f45670e97727f6679acca.tar.xz samba-9dd54f9bde9d8f3f830f45670e97727f6679acca.zip | |
Merge of tridge's fix for #include <sys/un.h> bug in redhat 7
| -rw-r--r-- | source/acconfig.h | 1 | ||||
| -rw-r--r-- | source/include/config.h.in | 4 | ||||
| -rw-r--r-- | source/include/includes.h | 2 | ||||
| -rw-r--r-- | source/nsswitch/winbind_nss_config.h | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/source/acconfig.h b/source/acconfig.h index f13bb443032..b31029cb875 100644 --- a/source/acconfig.h +++ b/source/acconfig.h @@ -155,3 +155,4 @@ #undef HAVE_VASPRINTF_DECL #undef HAVE_SNPRINTF_DECL #undef HAVE_VSNPRINTF_DECL +#undef HAVE_UNIXSOCKET diff --git a/source/include/config.h.in b/source/include/config.h.in index 780c9943528..7e0527028a9 100644 --- a/source/include/config.h.in +++ b/source/include/config.h.in @@ -218,6 +218,7 @@ #undef HAVE_VASPRINTF_DECL #undef HAVE_SNPRINTF_DECL #undef HAVE_VSNPRINTF_DECL +#undef HAVE_UNIXSOCKET /* The number of bytes in a int. */ #undef SIZEOF_INT @@ -945,9 +946,6 @@ /* Define if you have the <sys/time.h> header file. */ #undef HAVE_SYS_TIME_H -/* Define if you have the <sys/un.h> header file. */ -#undef HAVE_SYS_UN_H - /* Define if you have the <sys/unistd.h> header file. */ #undef HAVE_SYS_UNISTD_H diff --git a/source/include/includes.h b/source/include/includes.h index c5f4720a5af..e0a13f52708 100644 --- a/source/include/includes.h +++ b/source/include/includes.h @@ -107,7 +107,7 @@ #include <sys/socket.h> #endif -#ifdef HAVE_SYS_UN_H +#ifdef HAVE_UNIXSOCKET #include <sys/un.h> #endif diff --git a/source/nsswitch/winbind_nss_config.h b/source/nsswitch/winbind_nss_config.h index a946db89f6b..4902f6ec5c4 100644 --- a/source/nsswitch/winbind_nss_config.h +++ b/source/nsswitch/winbind_nss_config.h @@ -43,7 +43,7 @@ #include <sys/socket.h> #endif -#ifdef HAVE_SYS_UN_H +#ifdef HAVE_UNIXSOCKET #include <sys/un.h> #endif |