aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-09 17:46:07 -0600
committermegamage <none@none>2009-03-09 17:46:07 -0600
commit0a6ef039b2586707c0fcc6a6cf5a601ad1c341d9 (patch)
tree6336a786e64db6f270f794e3959673e36507eea4 /src
parent7b43f68ff78bb626b5c842f1cf904b7639131da1 (diff)
[7420] Not set cdecl calling convention for x64 platform for Unic/Linux. Author: VladimirMangos
This will prevent generation "warning: 'cdecl' attribute ignored" --HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/framework/Platform/Define.h2
-rw-r--r--src/shared/revision_nr.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h
index 7a7bdcab419..59c2418c745 100644
--- a/src/framework/Platform/Define.h
+++ b/src/framework/Platform/Define.h
@@ -57,6 +57,8 @@
# define TRINITY_GET_PROC_ADDR dlsym
# if defined(__APPLE_CC__) && defined(BIG_ENDIAN)
# define TRINITY_IMPORT __attribute__ ((longcall))
+# elif defined(__x86_64__)
+# define TRINITY_IMPORT
# else
# define TRINITY_IMPORT __attribute__ ((cdecl))
# endif //__APPLE_CC__ && BIG_ENDIAN
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index b22640c2f98..8c833b0df4a 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
- #define REVISION_NR "7419"
+ #define REVISION_NR "7420"
#endif // __REVISION_NR_H__