diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2013-08-26 11:51:18 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2013-08-26 11:51:18 +0200 |
| commit | 460fb120977e367853afc505a5f699ee0f0ac5a4 (patch) | |
| tree | b2b7bb9d46143c4b721fc3d37f09d35a1f9d45be | |
| parent | 63d8b3a507bce2f069416d6a8b05625743b41abf (diff) | |
security.h: rename to curl_sec.h to avoid name collision
I brought back security.h in commit bb5529331334e. As we actually
already found out back in 2005 in commit 62970da675249, the file name
security.h causes problems so I renamed it curl_sec.h instead.
| -rw-r--r-- | lib/Makefile.inc | 2 | ||||
| -rw-r--r-- | lib/curl_sec.h (renamed from lib/security.h) | 0 | ||||
| -rw-r--r-- | lib/ftp.c | 2 | ||||
| -rw-r--r-- | lib/krb5.c | 4 | ||||
| -rw-r--r-- | lib/security.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/lib/Makefile.inc b/lib/Makefile.inc index e28efc1ab..cb1030858 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -31,7 +31,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.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 \ if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h \ - getinfo.h strequal.h security.h memdebug.h http_chunks.h \ + getinfo.h strequal.h curl_sec.h memdebug.h http_chunks.h \ curl_fnmatch.h wildcard.h fileinfo.h ftplistparser.h strtok.h \ connect.h llist.h hash.h content_encoding.h share.h curl_md4.h \ curl_md5.h http_digest.h http_negotiate.h inet_pton.h amigaos.h \ diff --git a/lib/security.h b/lib/curl_sec.h index 82151e9c7..82151e9c7 100644 --- a/lib/security.h +++ b/lib/curl_sec.h @@ -59,7 +59,7 @@ #include "ftp.h" #include "fileinfo.h" #include "ftplistparser.h" -#include "security.h" +#include "curl_sec.h" #include "strtoofft.h" #include "strequal.h" #include "sslgen.h" diff --git a/lib/krb5.c b/lib/krb5.c index cb77e12ce..1643f11a6 100644 --- a/lib/krb5.c +++ b/lib/krb5.c @@ -1,6 +1,6 @@ /* GSSAPI/krb5 support for FTP - loosely based on old krb4.c * - * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan + * Copyright (c) 1995, 1996, 1997, 1998, 1999, 2013 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * Copyright (c) 2004 - 2012 Daniel Stenberg * All rights reserved. @@ -51,7 +51,7 @@ #include "ftp.h" #include "curl_gssapi.h" #include "sendf.h" -#include "security.h" +#include "curl_sec.h" #include "curl_memory.h" #include "warnless.h" diff --git a/lib/security.c b/lib/security.c index 7d6eadc3e..508c7b41e 100644 --- a/lib/security.c +++ b/lib/security.c @@ -57,7 +57,7 @@ #include "urldata.h" #include "curl_base64.h" #include "curl_memory.h" -#include "security.h" +#include "curl_sec.h" #include "ftp.h" #include "sendf.h" #include "rawstr.h" |