2004-05-24 Daniel Berlin <dberlin@dberlin.org>

	PR other/15627
	* engine/util.h: Include ansidecl.h.
	Make max and min static inline.
	* engine/util.c: Remove max and min from here.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@82202 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libbanshee/ChangeLog b/libbanshee/ChangeLog
index 8c0e6be..52472ca 100644 (file)
--- a/libbanshee/ChangeLog
+++ b/libbanshee/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-24  Daniel Berlin  <dberlin@dberlin.org>
+       
+       PR other/15627
+       * engine/util.h: Include ansidecl.h.
+       Make max and min static inline.
+       * engine/util.c: Remove max and min from here.
+
 2004-03-26  Andreas Jaeger  <aj@suse.de>
 
         * configure.in: Remove GCC_NO_EXECUTABLES.

diff --git a/libbanshee/engine/util.c b/libbanshee/engine/util.c
index 8989956..9261980 100644 (file)
--- a/libbanshee/engine/util.c
+++ b/libbanshee/engine/util.c
@@ -196,6 +196,4 @@ int ptr_cmp(const void *ptr1, const void *ptr2)
   return (char *) ptr1 - (char *) ptr2;
 }
 
-int min(int a, int b) { if (a < b) return a; else return b; }
-int max(int a, int b) { if (a < b) return b; else return a; }
 /* int abs(int a) { if (a < 0) return -a; else return a; } */

diff --git a/libbanshee/engine/util.h b/libbanshee/engine/util.h
index 1d13147..dea62fe 100644 (file)
--- a/libbanshee/engine/util.h
+++ b/libbanshee/engine/util.h
@@ -35,6 +35,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <regions.h>
+#include <ansidecl.h>
 #include "compiler.h"
 #include "linkage.h"
 #include "bool.h"
@@ -99,10 +100,8 @@ bool str_eq(const char *s1, const char *s2);
    if ptr1 < ptr2, or a value >0 if ptr1 > ptr2. */
 int ptr_cmp(const void *ptr1, const void *ptr2);
 
-extern inline int min(int, int);
-extern inline int max(int, int);
-extern inline int min(int a, int b) { if (a < b) return a; else return b; }
-extern inline int max(int a, int b) { if (a < b) return b; else return a; }
+static inline int min(int a, int b) { if (a < b) return a; else return b; }
+static inline int max(int a, int b) { if (a < b) return b; else return a; }
 EXTERN_C_END
 
 #endif