diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2016-07-27 01:08:51 +0300 |
---|---|---|
committer | Cyrill Gorcunov <gorcunov@gmail.com> | 2016-07-27 01:08:51 +0300 |
commit | 43bb293432306c41fa453d768fb21e4a98590f0a (patch) | |
tree | b0ff0420950e5f5220ff08046ab1ecbcab13725b /rdoff | |
parent | bb0fa088fb1c05dfb68e93d2cfc5d28d5792da1d (diff) | |
parent | 1df89ea03902161b76773d0eef48f277b49d918e (diff) | |
download | nasm-43bb293432306c41fa453d768fb21e4a98590f0a.tar.gz |
Merge branch 'nasm-2.12.xx'
* nasm-2.12.xx:
codeview: Fix ill-formed "S_COMPILE2" record.
rdoff: Add rdf2bin input dependency
labels: Warn if new label created on pass two
Add explicit void parameter to newmembuf() function declaration.
compiler.h: always undefine __STRICT_ANSI__ for gcc
| Conflicts:
| rdoff/Makefile.in
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Diffstat (limited to 'rdoff')
-rw-r--r-- | rdoff/rdoff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rdoff/rdoff.c b/rdoff/rdoff.c index 126a110a..ef9a5651 100644 --- a/rdoff/rdoff.c +++ b/rdoff/rdoff.c @@ -68,7 +68,7 @@ * how int32_t it is). * ======================================================================== */ -static memorybuffer *newmembuf() +static memorybuffer *newmembuf(void) { memorybuffer *t; |