Fixed makefile bugs
Fixed newline bug Removed some unnecessary stuff from amx.cpp
This commit is contained in:
parent
c003f90713
commit
b822b91c75
@ -123,3 +123,4 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
#endif //_INCLUDE_CQUEUE_H
|
#endif //_INCLUDE_CQUEUE_H
|
||||||
|
|
||||||
|
@ -95,7 +95,7 @@ if ($OPTIONS{"debug"})
|
|||||||
|
|
||||||
if ($OPTIONS{"amd64"})
|
if ($OPTIONS{"amd64"})
|
||||||
{
|
{
|
||||||
$cflags .= "-m64 -DSMALL_CELLSIZE=64 $cflags";
|
$cflags .= " -m64 -DSMALL_CELL_SIZE=64 -DHAVE_I64 $cflags";
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($OPTIONS{"jit"})
|
if ($OPTIONS{"jit"})
|
||||||
|
@ -457,14 +457,6 @@ int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, cell *params)
|
|||||||
} /* if */
|
} /* if */
|
||||||
} /* 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:
|
/* Note:
|
||||||
* params[0] == number of bytes for the additional parameters passed to the native function
|
* params[0] == number of bytes for the additional parameters passed to the native function
|
||||||
* params[1] == first argument
|
* 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
|
* can be stored; hopefully, all addresses can be assumed to have the
|
||||||
* same value for the upper 32-bits
|
* same value for the upper 32-bits
|
||||||
*/
|
*/
|
||||||
#if defined __64BIT__
|
|
||||||
assert((funcptr & ~0xffffffffL)==(amx_Callback & ~0xffffffffL));
|
|
||||||
#endif
|
|
||||||
if (funcptr!=NULL)
|
if (funcptr!=NULL)
|
||||||
func->address=(ucell)funcptr;
|
func->address=(ucell)funcptr;
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user