[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3498-g8c50d89

[Stefan Metzmacher]

The branch, v3-2-test has been updated
       via  8c50d89743a8e9024d238c6613ceea35cf160aa0 (commit)
      from  b4d9e92dfaa84b1361cdd6e49ad88e252c8fed4d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 8c50d89743a8e9024d238c6613ceea35cf160aa0
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Mar 9 12:35:21 2009 +0100

    s3:lib: interfaces.c isn't used in the configure tests anymore
    
    libreplace always provides the getifaddr() function.
    
    This fixes the build on sles8.
    
    metze
    (cherry picked from commit 1410490fe769bc79f98b4ab364685c7aed253e09)
    (cherry picked from commit bac96af2053996f28894458fce87e84c5c2356ff)

-----------------------------------------------------------------------

Summary of changes:
 source/lib/interfaces.c |   74 +----------------------------------------------
 1 files changed, 1 insertions(+), 73 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/interfaces.c b/source/lib/interfaces.c
index dd857ae..2535418 100644
--- a/source/lib/interfaces.c
+++ b/source/lib/interfaces.c
@@ -18,79 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-/* working out the interfaces for a OS is an incredibly non-portable
-   thing. We have several possible implementations below, and autoconf
-   tries each of them to see what works
-
-   Note that this file does _not_ include includes.h. That is so this code
-   can be called directly from the autoconf tests. That also means
-   this code cannot use any of the normal Samba debug stuff or defines.
-   This is standalone code.
-
-*/
-
-#ifndef AUTOCONF_TEST
-#include "config.h"
-#endif
-
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <netdb.h>
-#include <sys/ioctl.h>
-#include <netdb.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#ifdef HAVE_IFADDRS_H
-#include <ifaddrs.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#ifndef SIOCGIFCONF
-#ifdef HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>
-#endif
-#endif
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-
-#ifdef __COMPAR_FN_T
-#define QSORT_CAST (__compar_fn_t)
-#endif
-
-#ifndef QSORT_CAST
-#define QSORT_CAST (int (*)(const void *, const void *))
-#endif
-
-#ifdef HAVE_NET_IF_H
-#include <net/if.h>
-#endif
-
-#define SOCKET_WRAPPER_NOT_REPLACE
-#include "interfaces.h"
-#include "lib/replace/replace.h"
-
-/****************************************************************************
- Utility functions.
-****************************************************************************/
+#include "includes.h"
 
 /****************************************************************************
  Create a struct sockaddr_storage with the netmask bits set to 1.


-- 
Samba Shared Repository