Commit 460fb120 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

security.h: rename to curl_sec.h to avoid name collision 

I brought back security.h in commit bb552933. As we actually
already found out back in 2005 in commit 62970da6, the file name
security.h causes problems so I renamed it curl_sec.h instead.
parent 63d8b3a5

lib/Makefile.inc

+1 −1
Original line number Diff line number Diff line
@@ -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	\

lib/security.h→lib/curl_sec.h

+0 −0

File moved.

View file

lib/ftp.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

lib/krb5.c

+2 −2
Original line number Diff line number Diff line 
/* GSSAPI/krb5 support for FTP - loosely based on old krb4.c

 *

 * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Hgskolan

 * Copyright (c) 1995, 1996, 1997, 1998, 1999, 2013 Kungliga Tekniska Hgskolan

 * (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"

lib/security.c

+1 −1
Original line number Diff line number Diff line
@@ -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"