Commit 9770899a authored by Yang Tse's avatar Yang Tse
Browse files

Moved potential inclusion of system's malloc.h and memory.h header files to 

setup_once.h.  Inclusion of each header file is based on the definition of
NEED_MALLOC_H and NEED_MEMORY_H respectively.
parent fe8eeb56

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -6,6 +6,11 @@ 


                                  Changelog



Yang Tse (21 Apr 2009)

- Moved potential inclusion of system's malloc.h and memory.h header files to

  setup_once.h.  Inclusion of each header file is based on the definition of

  NEED_MALLOC_H and NEED_MEMORY_H respectively.



Daniel Stenberg (20 Apr 2009)

- Leanic Lefever reported a crash and did some detailed research on why and

  how it occurs (http://curl.haxx.se/mail/lib-2009-04/0289.html). The

acinclude.m4

+52 −0
Original line number Diff line number Diff line
@@ -893,6 +893,58 @@ AC_DEFUN([CURL_CHECK_HEADER_MALLOC], [ 
])





dnl CURL_CHECK_HEADER_MEMORY

dnl -------------------------------------------------

dnl Check for compilable and valid memory.h header,

dnl and check if it is needed even with stdlib.h for

dnl memory related functions.



AC_DEFUN([CURL_CHECK_HEADER_MEMORY], [

  AC_CACHE_CHECK([for memory.h], [ac_cv_header_memory_h], [

    AC_COMPILE_IFELSE([

      AC_LANG_PROGRAM([[

#include <memory.h>

      ]],[[

        void *p = malloc(10);

        void *q = calloc(10,10);

        free(p);

        free(q);

      ]])

    ],[

      ac_cv_header_memory_h="yes"

    ],[

      ac_cv_header_memory_h="no"

    ])

  ])

  if test "$ac_cv_header_memory_h" = "yes"; then

    AC_DEFINE_UNQUOTED(HAVE_MEMORY_H, 1,

      [Define to 1 if you have the memory.h header file.])

    #

    AC_COMPILE_IFELSE([

      AC_LANG_PROGRAM([[

#include <stdlib.h>

      ]],[[

        void *p = malloc(10);

        void *q = calloc(10,10);

        free(p);

        free(q);

      ]])

    ],[

      curl_cv_need_header_memory_h="no"

    ],[

      curl_cv_need_header_memory_h="yes"

    ])

    #

    case "$curl_cv_need_header_memory_h" in

      yes)

        AC_DEFINE_UNQUOTED(NEED_MEMORY_H, 1,

          [Define to 1 if you need the memory.h header file even with stdlib.h])

        ;;

    esac

  fi

])





dnl CURL_CHECK_TYPE_SOCKLEN_T

dnl -------------------------------------------------

dnl Check for existing socklen_t type, and provide

ares/CHANGES

+5 −0
Original line number Diff line number Diff line 
  Changelog for the c-ares project



* April 21 2009 (Yang Tse)

- Moved potential inclusion of system's malloc.h and memory.h header files to

  setup_once.h.  Inclusion of each header file is based on the definition of

  NEED_MALLOC_H and NEED_MEMORY_H respectively.



* March 11 2009 (Yang Tse)

- Japheth Cleaver fixed acountry.c replacing u_long with unsigned long.

ares/acinclude.m4

+52 −0
Original line number Diff line number Diff line
@@ -360,6 +360,58 @@ AC_DEFUN([CURL_CHECK_HEADER_MALLOC], [ 
])





dnl CURL_CHECK_HEADER_MEMORY

dnl -------------------------------------------------

dnl Check for compilable and valid memory.h header,

dnl and check if it is needed even with stdlib.h for

dnl memory related functions.



AC_DEFUN([CURL_CHECK_HEADER_MEMORY], [

  AC_CACHE_CHECK([for memory.h], [ac_cv_header_memory_h], [

    AC_COMPILE_IFELSE([

      AC_LANG_PROGRAM([[

#include <memory.h>

      ]],[[

        void *p = malloc(10);

        void *q = calloc(10,10);

        free(p);

        free(q);

      ]])

    ],[

      ac_cv_header_memory_h="yes"

    ],[

      ac_cv_header_memory_h="no"

    ])

  ])

  if test "$ac_cv_header_memory_h" = "yes"; then

    AC_DEFINE_UNQUOTED(HAVE_MEMORY_H, 1,

      [Define to 1 if you have the memory.h header file.])

    #

    AC_COMPILE_IFELSE([

      AC_LANG_PROGRAM([[

#include <stdlib.h>

      ]],[[

        void *p = malloc(10);

        void *q = calloc(10,10);

        free(p);

        free(q);

      ]])

    ],[

      curl_cv_need_header_memory_h="no"

    ],[

      curl_cv_need_header_memory_h="yes"

    ])

    #

    case "$curl_cv_need_header_memory_h" in

      yes)

        AC_DEFINE_UNQUOTED(NEED_MEMORY_H, 1,

          [Define to 1 if you need the memory.h header file even with stdlib.h])

        ;;

    esac

  fi

])





dnl CURL_CHECK_TYPE_SOCKLEN_T

dnl -------------------------------------------------

dnl Check for existing socklen_t type, and provide

ares/ares_init.c

+1 −2
Original line number Diff line number Diff line 
/* $Id$ */



/* Copyright 1998 by the Massachusetts Institute of Technology.

 * Copyright (C) 2007-2008 by Daniel Stenberg

 * Copyright (C) 2007-2009 by Daniel Stenberg

 *

 * Permission to use, copy, modify, and distribute this

 * software and its documentation for any purpose and without
@@ -20,7 +20,6 @@ 


#if defined(WIN32) && !defined(WATT32)

#include <iphlpapi.h>

#include <malloc.h>

#endif



#ifdef HAVE_SYS_PARAM_H