Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't pollute global namespace with min/max defines.

Browse Source 
Fixes build on new gcc4 revision.
This commit is contained in:
Rene Gollent 2012-11-03 13:35:43 +01:00
parent 6e50e79e54
commit 114d994682
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/add-ons/translators/shared/BaseTranslator.cpp
View File

@ -30,13 +30,16 @@
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
/*****************************************************************************/ /*****************************************************************************/
#include "BaseTranslator.h"
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <algorithm>
#include <Catalog.h> #include <Catalog.h>
#include <Locale.h> #include <Locale.h>
#include "BaseTranslator.h"
#undef B_TRANSLATION_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "BaseTranslator" #define B_TRANSLATION_CONTEXT "BaseTranslator"
@ -546,7 +549,8 @@ BaseTranslator::translate_from_bits_to_bits(BPositionIO *inSource,
if (writ < 0) if (writ < 0)
break; break;
remaining -= static_cast<uint32>(writ); remaining -= static_cast<uint32>(writ);
rd = inSource->Read(buf, min(1024, remaining)); rd = inSource->Read(buf, std::min(1024UL,
remaining));
} }
if (remaining > 0) if (remaining > 0)

7
src/add-ons/translators/shared/BaseTranslator.h
View File

@ -43,13 +43,6 @@
#include <View.h> #include <View.h>
#include "TranslatorSettings.h" #include "TranslatorSettings.h"
#ifndef min
#define min(a,b) ((a < b) ? (a) : (b))
#endif
#ifndef max
#define max(a,b) ((a > b) ? (a) : (b))
#endif
class BaseTranslator : public BTranslator { class BaseTranslator : public BTranslator {
public: public:
BaseTranslator(const char *name, const char *info, BaseTranslator(const char *name, const char *info,