Commit 07efe110 authored by Yang Tse's avatar Yang Tse
Browse files

if2ip.c: fix compiler warning 'enumerated type is mixed with another type'

parent 6e4835c7
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -132,7 +132,9 @@ bool Curl_if_is_interface_name(const char *interface)
  /* This is here just to support the old interfaces */
  char buf[256];

  return (Curl_if2ip(AF_INET, interface, buf, sizeof(buf)) != NULL);
  char *ip = Curl_if2ip(AF_INET, interface, buf, sizeof(buf));

  return (ip != NULL) ? TRUE : FALSE;
}

char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size)
+4 −4
Original line number Diff line number Diff line
#ifndef __IF2IP_H
#define __IF2IP_H
#ifndef HEADER_CURL_IF2IP_H
#define HEADER_CURL_IF2IP_H
/***************************************************************************
 *                                  _   _ ____  _
 *  Project                     ___| | | |  _ \| |
@@ -7,7 +7,7 @@
 *                            | (__| |_| |  _ <| |___
 *                             \___|\___/|_| \_\_____|
 *
 * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
 * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
 *
 * This software is licensed as described in the file COPYING, which
 * you should have received as part of this distribution. The terms
@@ -63,4 +63,4 @@ struct ifreq {
#define SIOCGIFADDR _IOW('s', 102, struct ifreq) /* Get if addr */
#endif /* interix */

#endif
#endif /* HEADER_CURL_IF2IP_H */