aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2018-02-10 00:44:07 +0300
committerCyrill Gorcunov <gorcunov@gmail.com>2018-02-10 00:44:07 +0300
commit53371ddd17b685f8880c22b8b698e494e0f1059b (patch)
tree1bbf0352013743d93017b37323bff3f4feed508b
parent3366e31b8a5485a59fe9210f330de83f8997a338 (diff)
parent9f45a77f46829e666b35530939b9237cf978d4dc (diff)
downloadnasm-53371ddd17b685f8880c22b8b698e494e0f1059b.tar.gz
nasm-53371ddd17b685f8880c22b8b698e494e0f1059b.tar.xz
nasm-53371ddd17b685f8880c22b8b698e494e0f1059b.zip
Merge branch 'nasm-2.13.xx'
* nasm-2.13.xx: nasmlib: Drop pure_func attrib from seg_alloc nasmlib: Drop unused seg_init
-rw-r--r--include/nasmlib.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/nasmlib.h b/include/nasmlib.h
index 78bb1e48..5bbfe457 100644
--- a/include/nasmlib.h
+++ b/include/nasmlib.h
@@ -189,11 +189,9 @@ int64_t readnum(char *str, bool *error);
int64_t readstrnum(char *str, int length, bool *warn);
/*
- * seg_init: Initialise the segment-number allocator.
* seg_alloc: allocate a hitherto unused segment number.
*/
-void pure_func seg_init(void);
-int32_t pure_func seg_alloc(void);
+int32_t seg_alloc(void);
/*
* Add/replace or remove an extension to the end of a filename