#include <assert.h>
#include <limits.h>
#include <inttypes.h>
-#include <libintl.h>
#include "error.h"
+#include "misc.h"
-#define _(s) dgettext(PACKAGE, s)
+// #define _(s) dgettext(PACKAGE, s)
+#define _(s) (s)
#if !defined(LBX_ERROR_LIMIT)
# define LBX_ERROR_LIMIT 256
static const char **user_errors;
static int user_error_count, user_error_max = 2;
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-
int lbx_error_new(const char *str)
{
assert(user_error_count >= 0 && user_error_count <= user_error_max);
const char **new;
size_t size;
- if (user_error_max >= MIN(SIZE_MAX, INT_MAX)/2 - LBX_EUBASE)
+ if (user_error_max >= MIN((size_t)-1, INT_MAX)/2 - LBX_EUBASE)
return -1;
- if (2 * user_error_max >= SIZE_MAX / sizeof *user_errors)
+ if (2 * user_error_max >= (size_t)-1 / sizeof *user_errors)
return -1;
size = 2 * user_error_max * sizeof *user_errors;