bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2024-12-22 23:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed compilation failure on 32bit FreeBSD and other due to int64_t being long long

Browse source
This commit is contained in:
Gerhard Rieger 2021-01-08 15:21:32 +01:00
parent 0a115feadc
commit 4124e733c6
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -1,4 +1,9 @@
 
Corrections:
Socat 1.7.4.0 failed to compile especially on 32 bit systems.
Thanks to Wang Mingyu and others for sending a patch or reporting this
issue.
####################### V 1.7.4.0: ####################### V 1.7.4.0:
Security: Security:

2
VERSION
View file

@ -1 +1 @@
"1.7.4.0" "1.7.4.0+"

10
compat.h
View file

@ -134,6 +134,8 @@ typedef int sig_atomic_t;
# define F_uint64_t "%u" # define F_uint64_t "%u"
# elif HAVE_BASIC_UINT64_T==6 # elif HAVE_BASIC_UINT64_T==6
# define F_uint64_t "%lu" # define F_uint64_t "%lu"
# elif HAVE_BASIC_UINT64_T==8
# define F_uint64_t "%llu"
# else # else
# error "HAVE_BASIC_UINT64_T is out of range:" HAVE_BASIC_UINT64_T # error "HAVE_BASIC_UINT64_T is out of range:" HAVE_BASIC_UINT64_T
# endif # endif
@ -147,7 +149,7 @@ typedef int sig_atomic_t;
# elif HAVE_BASIC_INT16_T==3 # elif HAVE_BASIC_INT16_T==3
# define F_int16_t "%d" # define F_int16_t "%d"
# elif HAVE_BASIC_INT16_T==5 # elif HAVE_BASIC_INT16_T==5
# define F_int16_t "%l" # define F_int16_t "%ld"
# else # else
# error "HAVE_BASIC_INT16_T is out of range:" HAVE_BASIC_INT16_T # error "HAVE_BASIC_INT16_T is out of range:" HAVE_BASIC_INT16_T
# endif # endif
@ -161,7 +163,7 @@ typedef int sig_atomic_t;
# elif HAVE_BASIC_INT32_T==3 # elif HAVE_BASIC_INT32_T==3
# define F_int32_t "%d" # define F_int32_t "%d"
# elif HAVE_BASIC_INT32_T==5 # elif HAVE_BASIC_INT32_T==5
# define F_int32_t "%l" # define F_int32_t "%ld"
# else # else
# error "HAVE_BASIC_INT32_T is out of range:" HAVE_BASIC_INT32_T # error "HAVE_BASIC_INT32_T is out of range:" HAVE_BASIC_INT32_T
# endif # endif
@ -175,7 +177,9 @@ typedef int sig_atomic_t;
# elif HAVE_BASIC_INT64_T==3 # elif HAVE_BASIC_INT64_T==3
# define F_int64_t "%d" # define F_int64_t "%d"
# elif HAVE_BASIC_INT64_T==5 # elif HAVE_BASIC_INT64_T==5
# define F_int64_t "%l" # define F_int64_t "%ld"
# elif HAVE_BASIC_INT64_T==7
# define F_int64_t "%lld"
# else # else
# error "HAVE_BASIC_INT64_T is out of range:" HAVE_BASIC_INT64_T # error "HAVE_BASIC_INT64_T is out of range:" HAVE_BASIC_INT64_T
# endif # endif