diff options
| author | dberlin <dberlin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-05-24 13:20:52 +0000 |
|---|---|---|
| committer | dberlin <dberlin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-05-24 13:20:52 +0000 |
| commit | 3d64cd6e4f157825f876dde80a53600d01d6b514 (patch) | |
| tree | dfa284046de992654a71f3fa26d499ded6681884 /libbanshee | |
| parent | 5965d276cd9cbfbd910fa41f9649f6a2dedfcf29 (diff) | |
| download | gcc-3d64cd6e4f157825f876dde80a53600d01d6b514.tar.gz | |
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
Diffstat (limited to 'libbanshee')
| -rw-r--r-- | libbanshee/ChangeLog | 7 | ||||
| -rw-r--r-- | libbanshee/engine/util.c | 2 | ||||
| -rw-r--r-- | libbanshee/engine/util.h | 7 |
3 files changed, 10 insertions, 6 deletions
diff --git a/libbanshee/ChangeLog b/libbanshee/ChangeLog index 8c0e6be8c3f..52472ca3612 100644 --- 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 8989956b70a..92619801af2 100644 --- 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 1d13147da08..dea62fe2d44 100644 --- 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 |