Commit 2066d60b authored by Yang Tse's avatar Yang Tse
Browse files

use prototypes to improve getservbyport_r detection

parent 51e84c77

ares/acinclude.m4

+23 −13
Original line number Original line Diff line number Diff line
@@ -2032,14 +2032,18 @@ AC_DEFUN([CARES_CHECK_GETSERVBYPORT_R], [ 
#ifdef HAVE_NETDB_H

#ifdef HAVE_NETDB_H

#include <netdb.h>

#include <netdb.h>

#endif

#endif

        extern int

        getservbyport_r(int, const char*, struct servent*,

                        struct servent_data*);

      ]],[[

      ]],[[

        int p1, p5;

        int p1, res;

        char *p2, p4[4096];

        char *p2;

        struct servent *p3, *p6;

        struct servent *p3;

        getservbyport_r(p1, p2, p3, p4, p5, &p6);

        struct servent_data *p4;

        res = getservbyport_r(p1, p2, p3, p4);

      ]])

      ]])

    ],[

    ],[

      cares_cv_getservbyport_r_nargs="6"

      cares_cv_getservbyport_r_nargs="4"

    ])

    ])

    #

    #

    if test "$cares_cv_getservbyport_r_nargs" = "unknown"; then

    if test "$cares_cv_getservbyport_r_nargs" = "unknown"; then
@@ -2051,11 +2055,14 @@ AC_DEFUN([CARES_CHECK_GETSERVBYPORT_R], [ 
#ifdef HAVE_NETDB_H

#ifdef HAVE_NETDB_H

#include <netdb.h>

#include <netdb.h>

#endif

#endif

          extern struct servent*

          getservbyport_r(int, const char*, struct servent*,

                          char*, int);

        ]],[[

        ]],[[

          int p1, p5;

          int p1, p5;

          char *p2, p4[4096];

          char *p2, p4[4096];

          struct servent *p3;

          struct servent *p3, res;

          getservbyport_r(p1, p2, p3, p4, p5);

          res = getservbyport_r(p1, p2, p3, p4, p5);

        ]])

        ]])

      ],[

      ],[

        cares_cv_getservbyport_r_nargs="5"

        cares_cv_getservbyport_r_nargs="5"
@@ -2071,15 +2078,18 @@ AC_DEFUN([CARES_CHECK_GETSERVBYPORT_R], [ 
#ifdef HAVE_NETDB_H

#ifdef HAVE_NETDB_H

#include <netdb.h>

#include <netdb.h>

#endif

#endif

          extern int

          getservbyport_r(int, const char*, struct servent*,

                          char*, size_t, struct servent**);

        ]],[[

        ]],[[

          int p1;

          int p1, res;

          char *p2;

          size_t p5;

          struct servent *p3;

          char *p2, p4[4096];

          struct servent_data p4;

          struct servent *p3, *p6;

          getservbyport_r(p1, p2, p3, &p4);

          res = getservbyport_r(p1, p2, p3, p4, p5, &p6);

        ]])

        ]])

      ],[

      ],[

        cares_cv_getservbyport_r_nargs="4"

        cares_cv_getservbyport_r_nargs="6"

      ])

      ])

    fi

    fi

    #

    #