aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2019-06-06 16:26:22 -0700
committerH. Peter Anvin <hpa@zytor.com>2019-06-06 16:26:22 -0700
commit5282cea85b964705fa3a66f535fa2672f6e055cd (patch)
tree7ce907ff6ab5d598febd19c55c5e5af460e7a71c /include
parent249c21707020df813f967550c12b59cab7e026d6 (diff)
parent0995aa24aa7999a98f54c66ad989b47ce9a41e78 (diff)
downloadnasm-5282cea85b964705fa3a66f535fa2672f6e055cd.tar.gz
nasm-5282cea85b964705fa3a66f535fa2672f6e055cd.tar.xz
nasm-5282cea85b964705fa3a66f535fa2672f6e055cd.zip
Merge branch 'master' of ssh://repo.or.cz/nasm
Resolved Conflicts: asm/preproc.c Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'include')
-rw-r--r--include/nasmlib.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/include/nasmlib.h b/include/nasmlib.h
index e9cc4474..593e2046 100644
--- a/include/nasmlib.h
+++ b/include/nasmlib.h
@@ -42,6 +42,19 @@
#include "bytesex.h"
/*
+ * Useful construct for private values
+ */
+union intorptr {
+ int64_t i;
+ uint64_t u;
+ size_t s;
+ void *p;
+ const void *cp;
+ uintptr_t up;
+};
+typedef union intorptr intorptr;
+
+/*
* Wrappers around malloc, realloc, free and a few more. nasm_malloc
* will fatal-error and die rather than return NULL; nasm_realloc will
* do likewise, and will also guarantee to work right on being passed