Skip to content

Commit

Permalink
[12625] Hotfix broken ACE configure script of [12619]
Browse files Browse the repository at this point in the history
Note: This will reintroduce problems for MacOS. So a proper patch is still pending.

Reopen cmangos/issues#85
  • Loading branch information
Schmoozerd authored and Cyberium committed Apr 7, 2014
1 parent aee3556 commit 218db48
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
23 changes: 12 additions & 11 deletions dep/ACE_wrappers/configure
Expand Up @@ -27898,18 +27898,19 @@ _ACEOF

fi

ACE_INT64=""
ACE_INT64=""
ACE_UINT64=""
dnl MaNGOS modification: fix MacOS build by checking [long long] before [long]
if test $ac_cv_sizeof_long_long = 8; then
ACE_INT64="signed long long"
ACE_UINT64="unsigned long long"
ace_u_long_long_typedef_set=yes
elif test $ac_cv_sizeof_long = 8; then
ACE_INT64="signed long"
ACE_UINT64="unsigned long"
ace_u_long_long_typedef_set=yes
dnl MaNGOS modification end
## CMaNGOS modification: Attention - order of checks size_of [long] / [long long] is required to allow/disallow build on MacOS/ some Linux machines
## this must (!) be fixed properly - if you experience problems on your system, try to reverse the order
if test $ac_cv_sizeof_long = 8; then
ACE_INT64="signed long"
ACE_UINT64="unsigned long"
ace_u_long_long_typedef_set=yes
elif test $ac_cv_sizeof_long_long = 8; then
ACE_INT64="signed long long"
ACE_UINT64="unsigned long long"
ace_u_long_long_typedef_set=yes
## CMaNGOS modification end
else
ace_u_long_long_typedef_set=no
fi
Expand Down
2 changes: 1 addition & 1 deletion src/shared/revision_nr.h
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "12624"
#define REVISION_NR "12625"
#endif // __REVISION_NR_H__

0 comments on commit 218db48

Please sign in to comment.