From b822b91c75b09d258291ab52daba1f97a2777943 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Sun, 22 Aug 2004 11:46:04 +0000
Subject: [PATCH] Fixed makefile bugs Fixed newline bug Removed some
 unnecessary stuff from amx.cpp

---
 amxmodx/CQueue.h    |  3 ++-
 amxmodx/Makefile.pl |  2 +-
 amxmodx/amx.cpp     | 11 -----------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/amxmodx/CQueue.h b/amxmodx/CQueue.h
index 22fa69f6..44285185 100755
--- a/amxmodx/CQueue.h
+++ b/amxmodx/CQueue.h
@@ -122,4 +122,5 @@ private:
 	unsigned int mSize;
 };
 
-#endif //_INCLUDE_CQUEUE_H
\ No newline at end of file
+#endif //_INCLUDE_CQUEUE_H
+
diff --git a/amxmodx/Makefile.pl b/amxmodx/Makefile.pl
index ea1adbbd..55ca1ecb 100755
--- a/amxmodx/Makefile.pl
+++ b/amxmodx/Makefile.pl
@@ -95,7 +95,7 @@ if ($OPTIONS{"debug"})
 
 if ($OPTIONS{"amd64"})
 {
-	$cflags .= "-m64 -DSMALL_CELLSIZE=64 $cflags";
+	$cflags .= " -m64 -DSMALL_CELL_SIZE=64 -DHAVE_I64 $cflags";
 }
 
 if ($OPTIONS{"jit"})
diff --git a/amxmodx/amx.cpp b/amxmodx/amx.cpp
index d477e6bb..8ffae9d4 100755
--- a/amxmodx/amx.cpp
+++ b/amxmodx/amx.cpp
@@ -457,14 +457,6 @@ int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, cell *params)
     } /* if */
   } /* if */
 
-  /* on 64-bit platforms, only the lower 32-bits were stored in the native
-   * function table; complete the address
-   */
-  #if defined __64BIT__
-    assert(sizeof(f)>sizeof(uint32_t));
-    f= (f & 0xffffffffL) | (amx_Callback & ~0xffffffffL);
-  #endif
-
   /* Note:
    *   params[0] == number of bytes for the additional parameters passed to the native function
    *   params[1] == first argument
@@ -1606,9 +1598,6 @@ int AMXAPI amx_Register(AMX *amx, AMX_NATIVE_INFO *list, int number)
        * can be stored; hopefully, all addresses can be assumed to have the
        * same value for the upper 32-bits
        */
-      #if defined __64BIT__
-        assert((funcptr & ~0xffffffffL)==(amx_Callback & ~0xffffffffL));
-      #endif
       if (funcptr!=NULL)
         func->address=(ucell)funcptr;
       else