summaryrefslogtreecommitdiff
path: root/locale/programs/localedef.h
diff options
context:
space:
mode:
Diffstat (limited to 'locale/programs/localedef.h')
-rw-r--r--locale/programs/localedef.h22
1 files changed, 5 insertions, 17 deletions
diff --git a/locale/programs/localedef.h b/locale/programs/localedef.h
index cb9386a798..0083faceab 100644
--- a/locale/programs/localedef.h
+++ b/locale/programs/localedef.h
@@ -1,5 +1,5 @@
/* General definitions for localedef(1).
- Copyright (C) 1998-2016 Free Software Foundation, Inc.
+ Copyright (C) 1998-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -24,7 +24,11 @@
#include <locale.h>
#include <stdbool.h>
#include <stddef.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "record-status.h"
#include "repertoire.h"
#include "../locarchive.h"
@@ -110,9 +114,6 @@ struct localedef_t
/* Global variables of the localedef program. */
-extern int verbose;
-extern int be_quiet;
-extern int oldstyle_tables;
extern const char *repertoire_global;
extern int max_locarchive_open_retry;
extern bool no_archive;
@@ -123,19 +124,6 @@ extern const char *alias_file;
#include <programs/xmalloc.h>
-/* Wrapper to switch LC_CTYPE back to the locale specified in the
- environment for output. */
-#define WITH_CUR_LOCALE(stmt) \
- do { \
- int saved_errno = errno; \
- const char *cur_locale_ = setlocale (LC_CTYPE, NULL); \
- setlocale (LC_CTYPE, ""); \
- errno = saved_errno; \
- stmt; \
- setlocale (LC_CTYPE, cur_locale_); \
- } while (0)
-
-
/* Mark given locale as to be read. */
extern struct localedef_t *add_to_readlist (int locale, const char *name,
const char *repertoire_name,