Skip to content

Commit b40e37f

Browse files
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.
1 parent ee0941a commit b40e37f

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

lib/Makefile.inc

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c \
4545
asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c \
4646
curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_multibyte.c \
4747
hostcheck.c bundles.c conncache.c pipeline.c dotdot.c x509asn1.c \
48-
http2.c curl_sasl_sspi.c smb.c curl_sasl_gssapi.c endian.c
48+
http2.c curl_sasl_sspi.c smb.c curl_sasl_gssapi.c curl_endian.c
4949

5050
LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \
5151
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 \
6363
curl_ntlm.h curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h \
6464
curl_ntlm_msgs.h curl_sasl.h curl_multibyte.h hostcheck.h bundles.h \
6565
conncache.h curl_setup_once.h multihandle.h setup-vms.h pipeline.h \
66-
dotdot.h x509asn1.h http2.h sigpipe.h smb.h endian.h
66+
dotdot.h x509asn1.h http2.h sigpipe.h smb.h curl_endian.h
6767

6868
LIB_RCFILES = libcurl.rc
6969

lib/Makefile.vc6

+1-1
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,7 @@ X_OBJS= \
535535
$(DIROBJ)\cookie.obj \
536536
$(DIROBJ)\curl_addrinfo.obj \
537537
$(DIROBJ)\curl_darwinssl.obj \
538+
$(DIROBJ)\curl_endian.obj \
538539
$(DIROBJ)\curl_fnmatch.obj \
539540
$(DIROBJ)\curl_gethostname.obj \
540541
$(DIROBJ)\curl_gssapi.obj \
@@ -555,7 +556,6 @@ X_OBJS= \
555556
$(DIROBJ)\dict.obj \
556557
$(DIROBJ)\dotdot.obj \
557558
$(DIROBJ)\easy.obj \
558-
$(DIROBJ)\endian.obj \
559559
$(DIROBJ)\escape.obj \
560560
$(DIROBJ)\file.obj \
561561
$(DIROBJ)\fileinfo.obj \

lib/endian.c lib/curl_endian.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include "curl_setup.h"
2424

25-
#include "endian.h"
25+
#include "curl_endian.h"
2626

2727
/*
2828
* Curl_read16_le()

lib/endian.h lib/curl_endian.h

File renamed without changes.

lib/curl_ntlm_core.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
#include "curl_md5.h"
107107
#include "curl_hmac.h"
108108
#include "warnless.h"
109-
#include "endian.h"
109+
#include "curl_endian.h"
110110

111111
#define _MPRINTF_REPLACE /* use our functions only */
112112
#include <curl/mprintf.h>

lib/curl_ntlm_msgs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
#define BUILDING_CURL_NTLM_MSGS_C
5353
#include "curl_ntlm_msgs.h"
5454
#include "curl_sasl.h"
55-
#include "endian.h"
55+
#include "curl_endian.h"
5656

5757
#define _MPRINTF_REPLACE /* use our functions only */
5858
#include <curl/mprintf.h>

packages/Symbian/group/libcurl.mmp

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ SOURCE \
4040
curl_ntlm.c curl_ntlm_wb.c curl_ntlm_core.c curl_ntlm_msgs.c \
4141
curl_sasl.c vtls/curl_schannel.c curl_multibyte.c \
4242
vtls/curl_darwinssl.c bundles.c conncache.c curl_sasl_sspi.c smb.c \
43-
curl_sasl_gssapi.c endian.c
43+
curl_sasl_gssapi.c curl_endian.c
4444

4545
USERINCLUDE ../../../lib ../../../include/curl
4646
#ifdef ENABLE_SSL

0 commit comments

Comments
 (0)