Merge commit 'meins/master'

diff --git a/error.h b/error.h
index 9b0de5ac12a946412a28735ec61dd88a3d9e7142..00fbbc867dd4d488c4886283c391950d4fcb7f34 100644 (file)
--- a/error.h
+++ b/error.h
@@ -25,7 +25,7 @@
        _ERROR(MMAP, "mmap error") \
        _ERROR(OSL, "osl error") \
        _ERROR(SIGNAL_SIG_ERR, "signal() returned SIG_ERR") \
-       _ERROR(OUTPUT, "error writing output file") \
+       _ERROR(OUTPUT, "error writing output") \
        _ERROR(MALFORMED_FORMAT, "malformed format string") \
        _ERROR(BAD_ALIGN_SPEC, "bad alignment specifier") \
        _ERROR(TRAILING_GARBAGE, "trailing garbage after specifier") \