diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2011-07-13 22:54:54 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-07-13 22:54:54 +0200 |
| commit | 44b58472378097faf9632d0dd9b4e478fb3433ed (patch) | |
| tree | 4e47fc46bc91532f695e2f895879dd9e7856887a /lib | |
| parent | ee4ed461288ec74641e3b96d5508628c07f689b0 (diff) | |
gssapi: rename our files to avoid conflicts
gssapi.h is used as a header name by Heimdal-style GSSAPI so it would
conflict with a private header using that name, and while renaming the
header I figured we should name the .c file accordingly as well.
Bug: http://curl.haxx.se/mail/lib-2011-07/0071.html
Reported by: Ben Greear
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.inc | 4 | ||||
| -rw-r--r-- | lib/curl_gssapi.c (renamed from lib/gssapi.c) | 2 | ||||
| -rw-r--r-- | lib/curl_gssapi.h (renamed from lib/gssapi.h) | 0 | ||||
| -rw-r--r-- | lib/http_negotiate.c | 2 | ||||
| -rw-r--r-- | lib/krb5.c | 2 | ||||
| -rw-r--r-- | lib/socks_gssapi.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/Makefile.inc b/lib/Makefile.inc index 1727a173c..51fc9191d 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -22,7 +22,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ pingpong.c rtsp.c curl_threads.c warnless.c hmac.c polarssl.c \ curl_rtmp.c openldap.c curl_gethostname.c gopher.c axtls.c \ idn_win32.c http_negotiate_sspi.c cyassl.c http_proxy.c non-ascii.c \ - asyn-ares.c asyn-thread.c gssapi.c + asyn-ares.c asyn-thread.c curl_gssapi.c HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \ progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h \ @@ -37,4 +37,4 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \ curl_base64.h rawstr.h curl_addrinfo.h curl_sspi.h slist.h nonblock.h \ curl_memrchr.h imap.h pop3.h smtp.h pingpong.h rtsp.h curl_threads.h \ warnless.h curl_hmac.h polarssl.h curl_rtmp.h curl_gethostname.h \ - gopher.h axtls.h cyassl.h http_proxy.h non-ascii.h asyn.h gssapi.h + gopher.h axtls.h cyassl.h http_proxy.h non-ascii.h asyn.h curl_gssapi.h diff --git a/lib/gssapi.c b/lib/curl_gssapi.c index 8911f5f32..69c3c88d7 100644 --- a/lib/gssapi.c +++ b/lib/curl_gssapi.c @@ -20,7 +20,7 @@ * ***************************************************************************/ -#include "gssapi.h" +#include "curl_gssapi.h" OM_uint32 Curl_gss_init_sec_context( OM_uint32 * minor_status, diff --git a/lib/gssapi.h b/lib/curl_gssapi.h index c5b58db58..c5b58db58 100644 --- a/lib/gssapi.h +++ b/lib/curl_gssapi.h diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c index e4a8ff259..36823f8cf 100644 --- a/lib/http_negotiate.c +++ b/lib/http_negotiate.c @@ -36,7 +36,7 @@ #include "urldata.h" #include "sendf.h" -#include "gssapi.h" +#include "curl_gssapi.h" #include "rawstr.h" #include "curl_base64.h" #include "http_negotiate.h" diff --git a/lib/krb5.c b/lib/krb5.c index 34329dc6a..5c60c8dc4 100644 --- a/lib/krb5.c +++ b/lib/krb5.c @@ -50,7 +50,7 @@ #include "urldata.h" #include "curl_base64.h" #include "ftp.h" -#include "gssapi.h" +#include "curl_gssapi.h" #include "sendf.h" #include "krb4.h" #include "curl_memory.h" diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c index 8af26c26a..872efb0e1 100644 --- a/lib/socks_gssapi.c +++ b/lib/socks_gssapi.c @@ -37,7 +37,7 @@ #include <stdlib.h> #endif -#include "gssapi.h" +#include "curl_gssapi.h" #include "urldata.h" #include "sendf.h" #include "connect.h" |