moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-10-31 15:45:12 -04:00
Code Issues Releases Wiki Activity

endian: Fixed Linux compilation issues

Browse Source 
Having files named endian.[c|h] seemed to cause issues under Linux so
renamed them both to have the curl_ prefix in the filenames.
This commit is contained in:
Steve Holme 2014-12-31 14:02:25 +00:00
parent ee0941a0b7
commit b40e37f93d
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Makefile.inc
View File

@ -45,7 +45,7 @@ LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c \
asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c \ asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c \
curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_multibyte.c \ curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_multibyte.c \
hostcheck.c bundles.c conncache.c pipeline.c dotdot.c x509asn1.c \ hostcheck.c bundles.c conncache.c pipeline.c dotdot.c x509asn1.c \
http2.c curl_sasl_sspi.c smb.c curl_sasl_gssapi.c endian.c http2.c curl_sasl_sspi.c smb.c curl_sasl_gssapi.c curl_endian.c
LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \ LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \
formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h if2ip.h \ formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h if2ip.h \
@ -63,7 +63,7 @@ LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \
curl_ntlm.h curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h \ curl_ntlm.h curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h \
curl_ntlm_msgs.h curl_sasl.h curl_multibyte.h hostcheck.h bundles.h \ curl_ntlm_msgs.h curl_sasl.h curl_multibyte.h hostcheck.h bundles.h \
conncache.h curl_setup_once.h multihandle.h setup-vms.h pipeline.h \ conncache.h curl_setup_once.h multihandle.h setup-vms.h pipeline.h \
dotdot.h x509asn1.h http2.h sigpipe.h smb.h endian.h dotdot.h x509asn1.h http2.h sigpipe.h smb.h curl_endian.h
LIB_RCFILES = libcurl.rc LIB_RCFILES = libcurl.rc

2
lib/Makefile.vc6
View File

@ -535,6 +535,7 @@ X_OBJS= \
$(DIROBJ)\cookie.obj \ $(DIROBJ)\cookie.obj \
$(DIROBJ)\curl_addrinfo.obj \ $(DIROBJ)\curl_addrinfo.obj \
$(DIROBJ)\curl_darwinssl.obj \ $(DIROBJ)\curl_darwinssl.obj \
$(DIROBJ)\curl_endian.obj \
$(DIROBJ)\curl_fnmatch.obj \ $(DIROBJ)\curl_fnmatch.obj \
$(DIROBJ)\curl_gethostname.obj \ $(DIROBJ)\curl_gethostname.obj \
$(DIROBJ)\curl_gssapi.obj \ $(DIROBJ)\curl_gssapi.obj \
@ -555,7 +556,6 @@ X_OBJS= \
$(DIROBJ)\dict.obj \ $(DIROBJ)\dict.obj \
$(DIROBJ)\dotdot.obj \ $(DIROBJ)\dotdot.obj \
$(DIROBJ)\easy.obj \ $(DIROBJ)\easy.obj \
$(DIROBJ)\endian.obj \
$(DIROBJ)\escape.obj \ $(DIROBJ)\escape.obj \
$(DIROBJ)\file.obj \ $(DIROBJ)\file.obj \
$(DIROBJ)\fileinfo.obj \ $(DIROBJ)\fileinfo.obj \

2
lib/endian.c → lib/curl_endian.c
View File

@ -22,7 +22,7 @@
#include "curl_setup.h" #include "curl_setup.h"
#include "endian.h" #include "curl_endian.h"
/* /*
* Curl_read16_le() * Curl_read16_le()

0
lib/endian.h → lib/curl_endian.h
View File

2
lib/curl_ntlm_core.c
View File

@ -106,7 +106,7 @@
#include "curl_md5.h" #include "curl_md5.h"
#include "curl_hmac.h" #include "curl_hmac.h"
#include "warnless.h" #include "warnless.h"
#include "endian.h" #include "curl_endian.h"
#define _MPRINTF_REPLACE /* use our functions only */ #define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h> #include <curl/mprintf.h>

2
lib/curl_ntlm_msgs.c
View File

@ -52,7 +52,7 @@
#define BUILDING_CURL_NTLM_MSGS_C #define BUILDING_CURL_NTLM_MSGS_C
#include "curl_ntlm_msgs.h" #include "curl_ntlm_msgs.h"
#include "curl_sasl.h" #include "curl_sasl.h"
#include "endian.h" #include "curl_endian.h"
#define _MPRINTF_REPLACE /* use our functions only */ #define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h> #include <curl/mprintf.h>

2
packages/Symbian/group/libcurl.mmp
View File

@ -40,7 +40,7 @@ SOURCE \
curl_ntlm.c curl_ntlm_wb.c curl_ntlm_core.c curl_ntlm_msgs.c \ curl_ntlm.c curl_ntlm_wb.c curl_ntlm_core.c curl_ntlm_msgs.c \
curl_sasl.c vtls/curl_schannel.c curl_multibyte.c \ curl_sasl.c vtls/curl_schannel.c curl_multibyte.c \
vtls/curl_darwinssl.c bundles.c conncache.c curl_sasl_sspi.c smb.c \ vtls/curl_darwinssl.c bundles.c conncache.c curl_sasl_sspi.c smb.c \
curl_sasl_gssapi.c endian.c curl_sasl_gssapi.c curl_endian.c
USERINCLUDE ../../../lib ../../../include/curl USERINCLUDE ../../../lib ../../../include/curl
#ifdef ENABLE_SSL #ifdef ENABLE_SSL