From 747981be8eadc4d8be5bc673c0b64efa556adf4e Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Fri, 12 Nov 2010 18:53:58 +0100
Subject: Revert following commits:   07bc7ea79509bcc9ef6e09151e81766ed00d3392 
  3392a50ea3f8573ea4b7a9d82b9833dab60cb0e9  
 9912637d32c9987719a1ea12db591aee2941891c

The purpose of the whole patch was to silence a compiler warning triggered
with GCC 4 on file ares_process.c  The specific compiler warning was
'dereferencing type-punned pointer might break strict-aliasing rules'.

A simpler patch will follow to equally silence the warning.
---
 acinclude.m4 | 59 -----------------------------------------------------------
 1 file changed, 59 deletions(-)

(limited to 'acinclude.m4')

diff --git a/acinclude.m4 b/acinclude.m4
index daa0c92..336dfab 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -669,45 +669,6 @@ AC_DEFUN([TYPE_SOCKADDR_STORAGE],
    ])
 ])
 
-dnl TYPE_SOCKADDR_STORAGE_SSFAM
-dnl -------------------------------------------------
-dnl Check for struct sockaddr_storage.ss_family
-dnl Seems some AIX systems don't have this.
-
-AC_DEFUN([TYPE_SOCKADDR_STORAGE_SSFAM],
-[
-   CARES_CHECK_STRUCT_MEMBER(
-   [
-#undef inline
-#ifdef HAVE_WINDOWS_H
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#ifdef HAVE_WINSOCK2_H
-#include <winsock2.h>
-#endif
-#else
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#endif
-],
-	[sockaddr_storage], [ss_family],
-        AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE_SSFAM, 1,
-                  [if struct sockaddr_storage.ss_family is defined]), ,
-   )
-])
-
 
 dnl CURL_CHECK_NI_WITHSCOPEID
 dnl -------------------------------------------------
@@ -1936,26 +1897,6 @@ AC_DEFUN([CARES_CHECK_STRUCT], [
   fi
 ])
 
-dnl This macro determines if the specified struct member exists in the specified file
-dnl Syntax:
-dnl CARES_CHECK_STRUCT_MEMBER(headers, struct name, member, if found, [if not found])
-
-AC_DEFUN([CARES_CHECK_STRUCT_MEMBER], [
-  AC_MSG_CHECKING([for struct $2.$3])
-  AC_TRY_COMPILE([$1], 
-    [
-      struct $2 struct_instance;
-      void* foo = &(struct_instance.$3);
-    ], ac_struct_member="yes", ac_found="no")
-  if test "$ac_struct_member" = "yes" ; then
-    AC_MSG_RESULT(yes)
-    $4
-  else
-    AC_MSG_RESULT(no)
-    $5
-  fi
-])
-
 dnl This macro determines if the specified constant exists in the specified file
 dnl Syntax:
 dnl CARES_CHECK_CONSTANT(headers, constant name, if found, [if not found])
-- 
cgit v1.2.3