Don't pollute global namespace with min/max defines.
Fixes build on new gcc4 revision.
This commit is contained in:
parent
6e50e79e54
commit
114d994682
@ -30,13 +30,16 @@
|
||||
// DEALINGS IN THE SOFTWARE.
|
||||
/*****************************************************************************/
|
||||
|
||||
#include "BaseTranslator.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include <Catalog.h>
|
||||
#include <Locale.h>
|
||||
|
||||
#include "BaseTranslator.h"
|
||||
|
||||
#undef B_TRANSLATION_CONTEXT
|
||||
#define B_TRANSLATION_CONTEXT "BaseTranslator"
|
||||
@ -546,7 +549,8 @@ BaseTranslator::translate_from_bits_to_bits(BPositionIO *inSource,
|
||||
if (writ < 0)
|
||||
break;
|
||||
remaining -= static_cast<uint32>(writ);
|
||||
rd = inSource->Read(buf, min(1024, remaining));
|
||||
rd = inSource->Read(buf, std::min(1024UL,
|
||||
remaining));
|
||||
}
|
||||
|
||||
if (remaining > 0)
|
||||
|
@ -43,13 +43,6 @@
|
||||
#include <View.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 {
|
||||
public:
|
||||
BaseTranslator(const char *name, const char *info,
|
||||
|
Loading…
Reference in New Issue
Block a user