kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #861 in FS/freeswitch from ~SJTHOMASON/freeswitch:bugfix/FS-9185-solaris-gcc-build-fails-with-error to master 

* commit '585cccd940f8b679a6b58a5e7605df2d3e8365bc':
  FS-9185: fix format ifdefs for Solaris SPARC
This commit is contained in:
Mike Jerris 2016-05-20 11:07:18 -05:00
parent 46f4fda018 585cccd940
commit 685a3c5c23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1122,6 +1122,8 @@ elif test "$ac_cv_sizeof_long" = "8"; then
case "$host" in case "$host" in
*pc-solaris2*) *pc-solaris2*)
;; ;;
sparc-*-solaris2*)
;;
*-solaris2*|*apple-darwin*|*-openbsd*) *-solaris2*|*apple-darwin*|*-openbsd*)
if test "$ac_cv_sizeof_long_long" = "8"; then if test "$ac_cv_sizeof_long_long" = "8"; then
int64_t_fmt='#define SWITCH_INT64_T_FMT "lld"' int64_t_fmt='#define SWITCH_INT64_T_FMT "lld"'

2
src/include/switch_platform.h
View File

@ -279,7 +279,7 @@ typedef intptr_t switch_ssize_t;
#endif #endif
#if defined(__sun__) && defined(__x86_64) #if defined(__sun__) && (defined(__x86_64) || defined(__arch64__))
#define SWITCH_TIME_T_FMT SWITCH_SIZE_T_FMT #define SWITCH_TIME_T_FMT SWITCH_SIZE_T_FMT
#else #else
#define SWITCH_TIME_T_FMT SWITCH_INT64_T_FMT #define SWITCH_TIME_T_FMT SWITCH_INT64_T_FMT