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.

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 9678ca5e3e9da473af3548397ae5a32930654c4f..8f9d16d8b9749379aed7b84e737631f2971c5cb9 100644 (file)
--- 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 b72488b64eac8e02eae243dc8df2aa5644d7a06b..ee20ebe123a25832a05b80d1552e90cf064d9ea4 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -535,6 +535,7 @@ X_OBJS= \
        $(DIROBJ)\cookie.obj \\r
        $(DIROBJ)\curl_addrinfo.obj \\r
        $(DIROBJ)\curl_darwinssl.obj \\r
+       $(DIROBJ)\curl_endian.obj \\r
        $(DIROBJ)\curl_fnmatch.obj \\r
        $(DIROBJ)\curl_gethostname.obj \\r
        $(DIROBJ)\curl_gssapi.obj \\r
@@ -555,7 +556,6 @@ X_OBJS= \
        $(DIROBJ)\dict.obj \\r
        $(DIROBJ)\dotdot.obj \\r
        $(DIROBJ)\easy.obj \\r
-       $(DIROBJ)\endian.obj \\r
        $(DIROBJ)\escape.obj \\r
        $(DIROBJ)\file.obj \\r
        $(DIROBJ)\fileinfo.obj \\r

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 cc329771e8ec1d6e6e4a95162750f46667864372..41202d73d9fec97eda446c84bf26167920eea9bc 100644 (file)
--- 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 b28d21df027debf0bf2193e4fa6402c312a3cc22..299e1afea2f671f0f78fccf09f310795245da55d 100644 (file)
--- 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 <curl/mprintf.h>

diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c
index c25bebe1e2f9ed3b8fb65a6a45a8ec3fedb39bf5..865954d3b76bfe7c7a585258723a2d7ec5944982 100644 (file)
--- 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 <curl/mprintf.h>

diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp
index e89ae3d82e04dbc88fad95564f3c10079a9bde09..2419c206cc7e7126daf5451e9a2d41bc719e0377 100644 (file)
--- 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