From 8cc695eb7fa4cd013e625ee00fa0ff1e3f8004e4 Mon Sep 17 00:00:00 2001 From: Josh Berdine Date: Mon, 3 Dec 2012 03:50:28 +0000 Subject: [PATCH] Change treatment of unsigned to avoid depending on unspecified behavior of recursive macros --- src/api/ml/build.sed | 6 +++--- src/api/ml/z3.idl | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/api/ml/build.sed b/src/api/ml/build.sed index e4434a5a1..d53a13713 100644 --- a/src/api/ml/build.sed +++ b/src/api/ml/build.sed @@ -1,7 +1,7 @@ # attempt to clean up the mess with 'unsigned' -s/__in unsigned __/__in __/g -s/__out unsigned __/__out __/g -s/__out_opt unsigned __/__out_opt __/g +s/ unsigned/ unsigned int/g +s/unsigned int long/unsigned long/g +s/unsigned int __/unsigned __/g # '@name ' -> 'Section: ' diff --git a/src/api/ml/z3.idl b/src/api/ml/z3.idl index 2450e387d..555835c88 100644 --- a/src/api/ml/z3.idl +++ b/src/api/ml/z3.idl @@ -91,11 +91,6 @@ quote(c,"#define xstr(s) str(s)"); quote(c,"#define str(s) #s"); -// CamlIDL (1.05) has a bug where it does not accept [unsigned] as a type, -// only as a specifier, so unsigned is defined to be unsigned int. -#define unsigned unsigned int - - // Suppress "warning C4090: 'function' : different 'const' qualifiers" as // CamlIDL does not seem to get this right. quote(c,"#pragma warning(disable:4090)");