1 files changed, 12 insertions, 1 deletions
diff --git a/src/mapi/mapi/entry.c b/src/mapi/mapi/entry.c
index b38df073918..968aa445285 100644
--- a/src/mapi/mapi/entry.c
+++ b/src/mapi/mapi/entry.c
@@ -26,9 +26,18 @@
  *    Chia-I Wu <[email protected]>
  */
 
+#include "entry.h"
+
+#if defined(USE_X86_ASM) && defined(__GNUC__)
+#   ifdef GLX_USE_TLS
+#      include "entry_x86_tls.h"
+#   else                 
+#      include "entry_x86_tsd.h"
+#   endif
+#else
+
 #include <stdlib.h>
 #include "u_current.h"
-#include "entry.h"
 #include "table.h"
 
 /* C version of the public entries */
@@ -50,3 +59,5 @@ void
 entry_patch(mapi_func entry, int slot)
 {
 }
+
+#endif /* asm */