From b40e37f93ddbcce9db44e213e925d74d0df9858a Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Wed, 31 Dec 2014 14:02:25 +0000 Subject: [PATCH] endian: Fixed Linux compilation issues Having files named endian.[c|h] seemed to cause issues under Linux so renamed them both to have the curl_ prefix in the filenames. --- lib/Makefile.inc | 4 ++-- lib/Makefile.vc6 | 2 +- lib/{endian.c => curl_endian.c} | 2 +- lib/{endian.h => curl_endian.h} | 0 lib/curl_ntlm_core.c | 2 +- lib/curl_ntlm_msgs.c | 2 +- packages/Symbian/group/libcurl.mmp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename lib/{endian.c => curl_endian.c} (99%) rename lib/{endian.h => curl_endian.h} (100%) diff --git a/lib/Makefile.inc b/lib/Makefile.inc index 9678ca5e3..8f9d16d8b 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -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 \ 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 \ - 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 \ 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_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 \ - 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 diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index b72488b64..ee20ebe12 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -535,6 +535,7 @@ X_OBJS= \ $(DIROBJ)\cookie.obj \ $(DIROBJ)\curl_addrinfo.obj \ $(DIROBJ)\curl_darwinssl.obj \ + $(DIROBJ)\curl_endian.obj \ $(DIROBJ)\curl_fnmatch.obj \ $(DIROBJ)\curl_gethostname.obj \ $(DIROBJ)\curl_gssapi.obj \ @@ -555,7 +556,6 @@ X_OBJS= \ $(DIROBJ)\dict.obj \ $(DIROBJ)\dotdot.obj \ $(DIROBJ)\easy.obj \ - $(DIROBJ)\endian.obj \ $(DIROBJ)\escape.obj \ $(DIROBJ)\file.obj \ $(DIROBJ)\fileinfo.obj \ diff --git a/lib/endian.c b/lib/curl_endian.c similarity index 99% rename from lib/endian.c rename to lib/curl_endian.c index cc329771e..41202d73d 100644 --- a/lib/endian.c +++ b/lib/curl_endian.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include "endian.h" +#include "curl_endian.h" /* * Curl_read16_le() diff --git a/lib/endian.h b/lib/curl_endian.h similarity index 100% rename from lib/endian.h rename to lib/curl_endian.h diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c index b28d21df0..299e1afea 100644 --- a/lib/curl_ntlm_core.c +++ b/lib/curl_ntlm_core.c @@ -106,7 +106,7 @@ #include "curl_md5.h" #include "curl_hmac.h" #include "warnless.h" -#include "endian.h" +#include "curl_endian.h" #define _MPRINTF_REPLACE /* use our functions only */ #include diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c index c25bebe1e..865954d3b 100644 --- a/lib/curl_ntlm_msgs.c +++ b/lib/curl_ntlm_msgs.c @@ -52,7 +52,7 @@ #define BUILDING_CURL_NTLM_MSGS_C #include "curl_ntlm_msgs.h" #include "curl_sasl.h" -#include "endian.h" +#include "curl_endian.h" #define _MPRINTF_REPLACE /* use our functions only */ #include diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp index e89ae3d82..2419c206c 100644 --- a/packages/Symbian/group/libcurl.mmp +++ b/packages/Symbian/group/libcurl.mmp @@ -40,7 +40,7 @@ SOURCE \ 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 \ 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 #ifdef ENABLE_SSL