Index: mppenc/branches/r2d/common/minimax.h
===================================================================
--- mppenc/branches/r2d/common/minimax.h	(revision 74)
+++ mppenc/branches/r2d/common/minimax.h	(revision 77)
@@ -18,8 +18,9 @@
  */
 
-#ifndef MPP_MINIMAX_H
-#define MPP_MINIMAX_H
+#pragma once
 
-#if   defined __GNUC__  &&  defined __cplusplus
+# define clip(x,min,max) ( (x) < (min) ? (min) : (x) > (max) ? (max) : (x) )
+
+#ifdef __cplusplus
 
 # define maxi(A,B)  ( (A) >? (B) )
@@ -30,9 +31,5 @@
 # define minf(A,B)  ( (A) <? (B) )
 
-# define absi(A)    abs   (A)
-# define absf(A)    fabsf (A)
-# define absd(A)    fabs  (A)
-
-#elif defined __GNUC__
+#else
 
 # define maxi(A,B)  ( (A) > (B)  ?  (A)  :  (B) )
@@ -43,4 +40,8 @@
 # define minf(A,B)  ( (A) < (B)  ?  (A)  :  (B) )
 
+#endif
+
+#ifdef __GNUC__
+
 # define absi(A)    abs   (A)
 # define absf(A)    fabsf (A)
@@ -49,16 +50,8 @@
 #else
 
-# define maxi(A,B)  ( (A) >  (B)  ?  (A)  :  (B) )
-# define mini(A,B)  ( (A) <  (B)  ?  (A)  :  (B) )
-# define maxd(A,B)  ( (A) >  (B)  ?  (A)  :  (B) )
-# define mind(A,B)  ( (A) <  (B)  ?  (A)  :  (B) )
-# define maxf(A,B)  ( (A) >  (B)  ?  (A)  :  (B) )
-# define minf(A,B)  ( (A) <  (B)  ?  (A)  :  (B) )
-
 # define absi(A)    ( (A) >= 0    ?  (A)  : -(A) )
 # define absf(A)    ( (A) >= 0.f  ?  (A)  : -(A) )
 # define absd(A)    ( (A) >= 0.   ?  (A)  : -(A) )
 
-#endif /* GNUC && C++ */
+#endif
 
-#endif /* MPP_MINIMAX_H */