summaryrefslogtreecommitdiffstats
path: root/lib/inet_pton.h
diff options
context:
space:
mode:
authorCurl Upstream <curl-library@cool.haxx.se>2014-09-10 06:07:58 (GMT)
committerBrad King <brad.king@kitware.com>2014-10-08 19:53:25 (GMT)
commit3fe5d9bff98b4716e219516c30d71462495324f4 (patch)
treecd369c3f671882cefde2f68a1ac8146f97c6bc84 /lib/inet_pton.h
parentf086cb372e41035260fcd9b4ed3d2cfb272f138f (diff)
downloadCMake-3fe5d9bff98b4716e219516c30d71462495324f4.zip
CMake-3fe5d9bff98b4716e219516c30d71462495324f4.tar.gz
CMake-3fe5d9bff98b4716e219516c30d71462495324f4.tar.bz2
curl 7.38.0 (reduced)
Extract upstream curl using the following shell code. url=git://github.com/bagder/curl.git && v=7.38.0 && r=202aa9f7 && paths=" CMake/* CMakeLists.txt COPYING include/curl/*.h include/curl/curlbuild.h.cmake lib/*.c lib/*.h lib/CMakeLists.txt lib/Makefile.inc lib/curl_config.h.cmake lib/libcurl.rc lib/vtls/*.c lib/vtls/*.h " && mkdir curl-$v-g$r-reduced && git clone $url curl-git && date=$(cd curl-git && git log -n 1 --format='%cd' $r) && (cd curl-git && git checkout $r && git archive --format=tar $r -- $paths) | (cd curl-$v-g$r-reduced && tar xv && rm lib/config-*.h) && echo "g$r date: $date"
Diffstat (limited to 'lib/inet_pton.h')
-rw-r--r--lib/inet_pton.h15
1 files changed, 5 insertions, 10 deletions
diff --git a/lib/inet_pton.h b/lib/inet_pton.h
index a659a97..43c5491 100644
--- a/lib/inet_pton.h
+++ b/lib/inet_pton.h
@@ -1,5 +1,5 @@
-#ifndef __INET_PTON_H
-#define __INET_PTON_H
+#ifndef HEADER_CURL_INET_PTON_H
+#define HEADER_CURL_INET_PTON_H
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
@@ -20,23 +20,18 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id$
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
int Curl_inet_pton(int, const char *, void *);
#ifdef HAVE_INET_PTON
-
-#if defined(HAVE_NO_INET_PTON_PROTO)
-int inet_pton(int af, const char *src, void *dst);
-#endif
-
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
#define Curl_inet_pton(x,y,z) inet_pton(x,y,z)
#endif
-#endif /* __INET_PTON_H */
+#endif /* HEADER_CURL_INET_PTON_H */
+