Merge -headers-reshuffle branch into main.

--HG--
rename : src/xine-engine/osd.h => include/xine/osd.h

1 files changed, 0 insertions, 54 deletions

diff --git a/src/xine-engine/xineintl.h b/src/xine-engine/xineintl.h
deleted file mode 100644
index 113a033fa..000000000
--- a/src/xine-engine/xineintl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2000-2005 the xine project
- * 
- * This file is part of xine, a free video player.
- * 
- * xine 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 2 of the License, or
- * (at your option) any later version.
- * 
- * xine 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- */
-
-#ifndef HAVE_XINEINTL_H
-#define HAVE_XINEINTL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <locale.h>
-
-#ifdef ENABLE_NLS
-#    include <libintl.h>
-#    define _(String) dgettext (XINE_TEXTDOMAIN, String)
-#    ifdef gettext_noop
-#        define N_(String) gettext_noop (String)
-#    else
-#        define N_(String) (String)
-#    endif
-#else
-/* Stubs that do something close enough.  */
-#    define textdomain(String) (String)
-#    define gettext(String) (String)
-#    define dgettext(Domain,Message) (Message)
-#    define dcgettext(Domain,Message,Type) (Message)
-#    define ngettext(Singular, Plural, IsPlural) (Singular)
-#    define bindtextdomain(Domain,Directory) (Domain)
-#    define _(String) (String)
-#    define N_(String) (String)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif