ALcune correzioni sparse, risistemati i commenti interni delle varie

[gapil.git] / sources / macros.h

diff --git a/sources/macros.h b/sources/macros.h
index 46862926eefd88e432b1c9ba39b74e4fd1cf71ec..1c978ed4d9d73703924171c95bc73b91ff4e1dc4 100644 (file)
--- a/sources/macros.h
+++ b/sources/macros.h
@@ -1,3 +1,21 @@
+/* macros.h
+ * 
+ * Copyright (C) 2000-2002 Simone Piccardi
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
 /*
  * Endianess conversion for int and short types
  */
@@ -5,19 +23,26 @@
         (v>>24) | ((v>>8)&0xFF00) | (v<<24) | ((v<<8)&0xFF0000); } )
 #define BE16_TO_LE16(val) ({typeof (val) v= (val);  (v>>8) | (v<<8); } )
 /* 
- * Define a protected, right typed, no side effects macro for min
+ * Define a protected, right typed, no side effects macro for min and max
  */
 #define min(x, y) ({typeof (x) x_ = (x); typeof (y) y_ = (y); \
                   x_ < y_ ? x_ : y_;}) 
+#define max(x, y) ({typeof (x) x_ = (x); typeof (y) y_ = (y); \
+                  x_ > y_ ? x_ : y_;}) 
 /* 
  * debugging print definition
  */
+#ifdef IS_DAEMON
+#define report(fmt, args...) UserNotify(fmt,##args)
+#else
 #define report(fmt, args...) printf(fmt,##args)
+#endif /* IS_DAEMON */
+
 #ifdef DEBUG                     /* done only on debugging */
 #define debug  report
 #else
 #define debug(fmt, arg...)
-#endif
+#endif /* DEBUG */
 
 
 /*