__NULL__ no longer triggers deprecation warnings.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3423 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2009-11-07 04:34:32 +00:00
parent e6498c778e
commit 79a45e1a19
2 changed files with 7 additions and 2 deletions

View File

@ -9133,8 +9133,13 @@ void QCC_PR_ParseDefs (char *classname)
i = 0; i = 0;
do do
{ {
if (QCC_PR_CheckImmediate("0")) if (pr_token_type == tt_immediate && (
(pr_immediate_type == type_integer && pr_immediate._int == 0) ||
(pr_immediate_type == type_float && pr_immediate._float == 0)))
{
QCC_PR_Lex();
G_FUNCTION(def->ofs+i) = 0; G_FUNCTION(def->ofs+i) = 0;
}
else else
{ {
name = QCC_PR_ParseName (); name = QCC_PR_ParseName ();

View File

@ -2419,7 +2419,7 @@ int QCC_PR_CheakCompConst(void)
if (!strncmp(pr_file_p, "__NULL__", 8)) if (!strncmp(pr_file_p, "__NULL__", 8))
{ {
static char retbuf[256]; static char retbuf[256];
sprintf(retbuf, "~0"); sprintf(retbuf, "0i");
pr_file_p = retbuf; pr_file_p = retbuf;
QCC_PR_Lex(); //translate the macro's value QCC_PR_Lex(); //translate the macro's value
pr_file_p = oldpr_file_p+8; pr_file_p = oldpr_file_p+8;