libcurl internal base64.h header file renamed to curl_base64.h (ac18b471) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/Makefile.Watcom

+5 −5

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ $(OBJ_DIR)\base64.obj: base64.c setup.h config-win32.h ..\include\curl\curlbuild
		..\include\curl\curlrules.h ..\include\curl\easy.h &
		..\include\curl\multi.h urldata.h cookie.h ..\include\curl\curl.h &
		formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h splay.h &
		easyif.h base64.h memory.h memdebug.h
		easyif.h curl_base64.h memory.h memdebug.h
		$(OBJ_DIR)\hostip.obj: hostip.c setup.h config-win32.h ..\include\curl\curlbuild.h &
		..\include\curl\curlrules.h setup_once.h urldata.h cookie.h &
		..\include\curl\curl.h ..\include\curl\curlver.h &
		@@ -154,7 +154,7 @@ $(OBJ_DIR)\http.obj: http.c setup.h config-win32.h ..\include\curl\curlbuild.h &
		..\include\curl\curlrules.h ..\include\curl\easy.h &
		..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h &
		http_chunks.h hostip.h hash.h llist.h splay.h transfer.h sendf.h &
		easyif.h progress.h base64.h strequal.h sslgen.h http_digest.h &
		easyif.h progress.h curl_base64.h strequal.h sslgen.h http_digest.h &
		http_ntlm.h http_negotiate.h url.h share.h http.h memory.h select.h &
		parsedate.h strtoofft.h multiif.h ..\include\curl\mprintf.h memdebug.h
		$(OBJ_DIR)\sendf.obj: sendf.c setup.h config-win32.h ..\include\curl\curlbuild.h &
		@@ -206,7 +206,7 @@ $(OBJ_DIR)\ldap.obj: ldap.c setup.h config-win32.h ..\include\curl\curlbuild.h &
		..\include\curl\curlrules.h ..\include\curl\easy.h &
		..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h &
		http_chunks.h hostip.h hash.h llist.h splay.h sendf.h escape.h &
		transfer.h strequal.h strtok.h curl_ldap.h memory.h base64.h &
		transfer.h strequal.h strtok.h curl_ldap.h memory.h curl_base64.h &
		..\include\curl\mprintf.h memdebug.h
		$(OBJ_DIR)\ssluse.obj: ssluse.c setup.h config-win32.h ..\include\curl\curlbuild.h &
		..\include\curl\curlrules.h setup_once.h urldata.h cookie.h &
		@@ -343,7 +343,7 @@ $(OBJ_DIR)\http_digest.obj: http_digest.c setup.h config-win32.h &
		..\include\curl\curlrules.h ..\include\curl\easy.h &
		..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h &
		http_chunks.h hostip.h hash.h llist.h splay.h sendf.h strequal.h &
		base64.h curl_md5.h http_digest.h strtok.h url.h memory.h easyif.h &
		curl_base64.h curl_md5.h http_digest.h strtok.h url.h memory.h easyif.h &
		..\include\curl\mprintf.h memdebug.h
		$(OBJ_DIR)\md5.obj: md5.c setup.h config-win32.h ..\include\curl\curlbuild.h &
		..\include\curl\curlrules.h setup_once.h curl_md5.h
		@@ -355,7 +355,7 @@ $(OBJ_DIR)\http_ntlm.obj: http_ntlm.c setup.h config-win32.h &
		..\include\curl\curlrules.h ..\include\curl\easy.h &
		..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h &
		http_chunks.h hostip.h hash.h llist.h splay.h easyif.h sendf.h &
		strequal.h base64.h http_ntlm.h url.h memory.h ssluse.h &
		strequal.h curl_base64.h http_ntlm.h url.h memory.h ssluse.h &
		..\include\curl\mprintf.h memdebug.h
		$(OBJ_DIR)\inet_pton.obj: inet_pton.c setup.h config-win32.h &
		..\include\curl\curlbuild.h ..\include\curl\curlrules.h setup_once.h &

lib/Makefile.inc

+2 −2

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \
		inet_ntop.c parsedate.c select.c gtls.c sslgen.c tftp.c splay.c \
		strdup.c socks.c ssh.c nss.c qssl.c

		HHEADERS = arpa_telnet.h netrc.h file.h timeval.h base64.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 \
		if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h \
		getinfo.h strequal.h krb4.h memdebug.h inet_ntoa_r.h http_chunks.h \
		@@ -20,4 +20,4 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h base64.h hostip.h \
		strtoofft.h strerror.h inet_ntop.h curlx.h memory.h setup.h \
		transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h \
		tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h \
		qssl.h
		curl_base64.h

lib/base64.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		* \| (__\| \|_\| \| _ <\| \|___
		* \___\|\___/\|_\| \_\_____\|
		*
		* Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
		* Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
		*
		* This software is licensed as described in the file COPYING, which
		* you should have received as part of this distribution. The terms
		@@ -42,7 +42,7 @@

		#include "urldata.h" /* for the SessionHandle definition */
		#include "easyif.h" /* for Curl_convert_... prototypes */
		#include "base64.h"
		#include "curl_base64.h"
		#include "memory.h"

		/* include memdebug.h last */

lib/base64.h→lib/curl_base64.h

+3 −3

Original line number	Diff line number	Diff line
		#ifndef __BASE64_H
		#define __BASE64_H
		#ifndef __CURL_BASE64_H
		#define __CURL_BASE64_H
		/***************************************************************************
		* _ _ ____ _
		* Project ___\| \| \| \| _ \\| \|
		@@ -7,7 +7,7 @@
		* \| (__\| \|_\| \| _ <\| \|___
		* \___\|\___/\|_\| \_\_____\|
		*
		* Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
		* Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
		*
		* This software is licensed as described in the file COPYING, which
		* you should have received as part of this distribution. The terms

lib/http.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@
		#include "easyif.h" /* for Curl_convert_... prototypes */
		#include "formdata.h"
		#include "progress.h"
		#include "base64.h"
		#include "curl_base64.h"
		#include "cookie.h"
		#include "strequal.h"
		#include "sslgen.h"