Commit b40e37f9 authored by Steve Holme's avatar Steve Holme
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.
parent ee0941a0

lib/Makefile.inc

+2 −2
Original line number Diff line number Diff line
@@ -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

lib/Makefile.vc6

+1 −1
Original line number Diff line number Diff line
@@ -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 \

lib/endian.c→lib/curl_endian.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#include "curl_setup.h"



#include "endian.h"

#include "curl_endian.h"



/*

 * Curl_read16_le()

lib/endian.h→lib/curl_endian.h

+0 −0

File moved.

View file

lib/curl_ntlm_core.c

+1 −1
Original line number Diff line number Diff line
@@ -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>