Merge commit 'meins/master'

diff --git a/Makefile b/Makefile
index 0a44111620483a6989690843c43495ae630083b1..7d4b045e6971abc2a56d9bb8f8ae70fe94046a6d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -101,9 +101,9 @@ $(realname): $(objects)
 
 osl_errors.h: errlist
        sed -e 's/\([A-Z_]*\)   .*/     E_OSL_\1/' \
-               -e '1s/^/enum osl_errors {\n/1' \
+               -e '1s/^/enum osl_errors {/1' \
                -e '$$!s/$$/,/g' \
-               -e '$$s/$$/\n};/1' $< > $@
+               -e '$$s/$$/};/1' $< > $@
 
 errtab.h: errlist
        sed -e 's/^\([A-Z_]*\)\s*\(.*\)/_S(E_OSL_\1, \2)/g' $< > $@

diff --git a/log.h b/log.h
index 9c3bf4ba6eaf2d398e52cb4aadfad36bb7c48434..8c648f4ddf65a435a27b211983abfeb55abcf922 100644 (file)
--- a/log.h
+++ b/log.h
@@ -23,9 +23,6 @@
 #include <assert.h>
 #include "gcc-compat.h"
 
-/** compute the maximum of \a a and \a b */
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-
 /** debug loglevel, gets really noisy */
 #define DEBUG 1
 /** still noisy, but won't fill your disk */