diff options
Diffstat (limited to 'server/util')
-rw-r--r-- | server/util/server.c | 1 | ||||
-rw-r--r-- | server/util/sssd-i18n.h | 29 | ||||
-rw-r--r-- | server/util/util.h | 12 |
3 files changed, 9 insertions, 33 deletions
diff --git a/server/util/server.c b/server/util/server.c index e8daf87c..3a84c70d 100644 --- a/server/util/server.c +++ b/server/util/server.c @@ -29,7 +29,6 @@ #include <fcntl.h> #include <unistd.h> #include "util/util.h" -#include "util/sssd-i18n.h" #include "ldb.h" #include "confdb/confdb.h" diff --git a/server/util/sssd-i18n.h b/server/util/sssd-i18n.h deleted file mode 100644 index 73b1c80b..00000000 --- a/server/util/sssd-i18n.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - Authors: - Stephen Gallagher <sgallagh@redhat.com> - - Copyright (C) 2009 Red Hat - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef _SSSD_I18N_H -#define _SSSD_I18N_H - -#include <locale.h> -#include <libintl.h> -#define _(STRING) gettext (STRING) -#include "config.h" - -#endif diff --git a/server/util/util.h b/server/util/util.h index a9d25532..9a27ae55 100644 --- a/server/util/util.h +++ b/server/util/util.h @@ -27,19 +27,25 @@ #include <unistd.h> #include <string.h> #include <errno.h> +#include <libintl.h> #include <limits.h> +#include <locale.h> #include <time.h> #include <pcre.h> + #include "config.h" -#include "talloc.h" -#include "tevent.h" -#include "ldb.h" + +#include <talloc.h> +#include <tevent.h> +#include <ldb.h> #ifndef HAVE_ERRNO_T #define HAVE_ERRNO_T typedef int errno_t; #endif +#define _(STRING) gettext (STRING) + extern const char *debug_prg_name; extern int debug_level; extern int debug_timestamps; |