X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fcalc.c;h=0e21ec59bf041e15b343a865beb7421c04da4dcc;hb=e36f7cd568212baefd1d597adb25c0b040f66870;hp=f701b5a3fca9388227de8943c42f222861263b8f;hpb=c264e2866e9d509e4ed73e2542e80d4c7fb0a92b;p=m6w6%2Fext-psi

diff --git a/src/calc.c b/src/calc.c
index f701b5a..0e21ec5 100644
--- a/src/calc.c
+++ b/src/calc.c
@@ -1,5 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
+#else
+# include "php_config.h"
 #endif
 
 #include "php.h"
@@ -97,12 +99,12 @@ int psi_calc_num_exp(num_exp *exp, impl_val *strct, impl_val *res) {
 #define PSI_CALC_OP(var) do { \
 	const char *fmt = "calc %" PRI##var ", %" PRI##var ": %" PRI##var "\n"; \
 	res->var = PSI_CALC(v1->var, v2->var); \
-	if (!res->var) fprintf(stderr, fmt, v1->var, v2->var, res->var); \
+	if (!res->var && (v1->var || v2->var)) fprintf(stderr, fmt, v1->var, v2->var, res->var); \
 } while (0)
 #define PSI_CALC_OP2(vres, var1, var2) do { \
 	const char *fmt = "calc %" PRI##var1 ", %" PRI##var2 ": %" PRI##vres "\n"; \
 	res->vres = PSI_CALC(v1->var1, v2->var2); \
-	if (!res->vres) fprintf(stderr, fmt, v1->var1, v2->var2, res->vres); \
+	if (!res->vres && (v1->var1 || v2->var2)) fprintf(stderr, fmt, v1->var1, v2->var2, res->vres); \
 } while(0)
 
 #ifdef HAVE_LONG_DOUBLE