diff options
| author | Adrien Destugues <pulkomandy@pulkomandy.tk> | 2015-08-17 20:09:47 +0200 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2015-10-12 21:08:25 +0100 |
| commit | 2071c2a91b5f8647d95ffc95e524657bff8089d9 (patch) | |
| tree | 2de759d980e060d28822e72420fd9920e7eb205e /utils/utils.h | |
| parent | 46ff49baef23b4fff4eda0925793880b3d0eeaf5 (diff) | |
| download | netsurf-2071c2a91b5f8647d95ffc95e524657bff8089d9.tar.gz netsurf-2071c2a91b5f8647d95ffc95e524657bff8089d9.tar.bz2 | |
Fix BeOS build
Mainly C/C++ conflicts:
* Designated initializer are not part of C++
* C++ already defines min() and max()
* Force C99 and remove -O0 since we now use a decent compiler
Diffstat (limited to 'utils/utils.h')
| -rw-r--r-- | utils/utils.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/utils/utils.h b/utils/utils.h index 3fec34aa1..e4688ce2c 100644 --- a/utils/utils.h +++ b/utils/utils.h @@ -59,6 +59,7 @@ struct dirent; #undef max #endif +#ifndef __cplusplus #ifndef min #define min(x,y) (((x)<(y))?(x):(y)) #endif @@ -66,6 +67,7 @@ struct dirent; #ifndef max #define max(x,y) (((x)>(y))?(x):(y)) #endif +#endif #ifndef PRIxPTR #define PRIxPTR "x" |