git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR bootstrap/15627 (Sun CC cannot bootstrap GCC) 

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.

From-SVN: r82202
This commit is contained in:
Daniel Berlin 2004-05-24 13:20:52 +00:00 committed by Daniel Berlin
parent 148907eaa6
commit 687a642498
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libbanshee/ChangeLog
View File

@ -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> 2004-03-26 Andreas Jaeger <aj@suse.de>
* configure.in: Remove GCC_NO_EXECUTABLES. * configure.in: Remove GCC_NO_EXECUTABLES.

2
libbanshee/engine/util.c
View File

@ -196,6 +196,4 @@ int ptr_cmp(const void *ptr1, const void *ptr2)
return (char *) ptr1 - (char *) 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; } */ /* int abs(int a) { if (a < 0) return -a; else return a; } */

7
libbanshee/engine/util.h
View File

@ -35,6 +35,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <regions.h> #include <regions.h>
#include <ansidecl.h>
#include "compiler.h" #include "compiler.h"
#include "linkage.h" #include "linkage.h"
#include "bool.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. */ if ptr1 < ptr2, or a value >0 if ptr1 > ptr2. */
int ptr_cmp(const void *ptr1, const void *ptr2); int ptr_cmp(const void *ptr1, const void *ptr2);
extern inline int min(int, int); static inline int min(int a, int b) { if (a < b) return a; else return b; }
extern inline int max(int, int); static inline int max(int a, int b) { if (a < b) return b; else return a; }
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; }
EXTERN_C_END EXTERN_C_END
#endif #endif