From: Andre Noll <maan@systemlinux.org>
Date: Thu, 5 Jun 2008 08:27:14 +0000 (+0200)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.1.0~82
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=f065a93d3307f2065fcf8c95509166d15af4194c;hp=b0884806fccc7a0b1e489ee57a3fa02e3a16fe84;p=osl.git

Merge commit 'meins/master'
---

diff --git a/Makefile b/Makefile
index 0a44111..7d4b045 100644
--- 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 9c3bf4b..8c648f4 100644
--- 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 */