moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

gssapi: rename our files to avoid conflicts

Browse Source 
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
This commit is contained in:
Daniel Stenberg 2011-07-13 22:54:54 +02:00
parent ee4ed46128
commit 44b5847237
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Makefile.inc
View File

@ -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 \ 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 \ 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 \ 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 \ 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 \ 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_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 \ 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 \ 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

2
lib/gssapi.c → lib/curl_gssapi.c
View File

@ -20,7 +20,7 @@
* *
***************************************************************************/ ***************************************************************************/
#include "gssapi.h" #include "curl_gssapi.h"
OM_uint32 Curl_gss_init_sec_context( OM_uint32 Curl_gss_init_sec_context(
OM_uint32 * minor_status, OM_uint32 * minor_status,

0
lib/gssapi.h → lib/curl_gssapi.h
View File

2
lib/http_negotiate.c
View File

@ -36,7 +36,7 @@
#include "urldata.h" #include "urldata.h"
#include "sendf.h" #include "sendf.h"
#include "gssapi.h" #include "curl_gssapi.h"
#include "rawstr.h" #include "rawstr.h"
#include "curl_base64.h" #include "curl_base64.h"
#include "http_negotiate.h" #include "http_negotiate.h"

2
lib/krb5.c
View File

@ -50,7 +50,7 @@
#include "urldata.h" #include "urldata.h"
#include "curl_base64.h" #include "curl_base64.h"
#include "ftp.h" #include "ftp.h"
#include "gssapi.h" #include "curl_gssapi.h"
#include "sendf.h" #include "sendf.h"
#include "krb4.h" #include "krb4.h"
#include "curl_memory.h" #include "curl_memory.h"

2
lib/socks_gssapi.c
View File

@ -37,7 +37,7 @@
#include <stdlib.h> #include <stdlib.h>
#endif #endif
#include "gssapi.h" #include "curl_gssapi.h"
#include "urldata.h" #include "urldata.h"
#include "sendf.h" #include "sendf.h"
#include "connect.h" #include "connect.h"