From 6d3ae7cf2123bda5b7eb61af09e3b40b3782b0a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Sun, 20 Nov 2011 18:30:01 +0100
Subject: [PATCH] cpp: Use svalue accessor macros.
---
src/cpp.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/cpp.c b/src/cpp.c
index 694490cf10..e46e21acaa 100644
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -1619,8 +1619,8 @@ static void insert_callback_define(struct cpp *this,
ref_push_string( def->link.s );
push_string( make_shared_binary_pcharp( args[0].arg, args[0].len ) );
safe_apply_handler( "evaluate_define", this->handler, this->compat_handler, 2, 0 );
- if( sp[-1].type == T_STRING )
- string_builder_shared_strcat(tmp,sp[-1].u.string);
+ if( TYPEOF(sp[-1]) == T_STRING )
+ string_builder_shared_strcat(tmp, sp[-1].u.string);
pop_stack();
}
@@ -1631,8 +1631,8 @@ static void insert_callback_define_no_args(struct cpp *this,
{
ref_push_string( def->link.s );
safe_apply_handler( "evaluate_define", this->handler, this->compat_handler, 1, 0 );
- if( sp[-1].type == T_STRING )
- string_builder_shared_strcat(tmp,sp[-1].u.string);
+ if( TYPEOF(sp[-1]) == T_STRING )
+ string_builder_shared_strcat(tmp, sp[-1].u.string);
pop_stack();
}
@@ -2000,7 +2000,7 @@ void f_cpp(INT32 args)
NEW_MAPPING_LOOP (predefs->data) {
if (TYPEOF(k->val) == T_STRING)
add_define (&this, k->ind.u.string, k->val.u.string);
- else if(k->val.type != T_INT || k->val.u.integer )
+ else if(TYPEOF(k->val) != T_INT || k->val.u.integer )
{
struct define *def;
if( index_shared_string( k->ind.u.string, k->ind.u.string->len-1) == ')' )
--
GitLab