From 562773d60e1775780f5fb301670b8d515f0612d3 Mon Sep 17 00:00:00 2001
From: Pierre d'Herbemont <pdherbemont@videolan.org>
Date: Mon, 26 May 2008 20:18:54 +0200
Subject: [PATCH] libvlccore: Rename iso_lang.h to vlc_iso_lang.h because we
 use VLC_EXPORT there, and plugins may use it.

---
 include/{iso_lang.h => vlc_iso_lang.h} | 0
 modules/access/dvdnav.c                | 2 +-
 modules/access/dvdread.c               | 2 +-
 modules/demux/mkv.cpp                  | 2 +-
 modules/demux/mp4/mp4.c                | 2 +-
 modules/demux/ts.c                     | 2 +-
 modules/mux/mp4.c                      | 2 +-
 modules/mux/mpeg/ps.c                  | 2 +-
 modules/mux/mpeg/ts.c                  | 2 +-
 src/Makefile.am                        | 2 +-
 src/input/es_out.c                     | 2 +-
 src/text/iso_lang.c                    | 2 +-
 12 files changed, 11 insertions(+), 11 deletions(-)
 rename include/{iso_lang.h => vlc_iso_lang.h} (100%)

diff --git a/include/iso_lang.h b/include/vlc_iso_lang.h
similarity index 100%
rename from include/iso_lang.h
rename to include/vlc_iso_lang.h
diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 763ceea60c..48ea513006 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -52,7 +52,7 @@
 #endif
 
 #include "vlc_keys.h"
-#include "iso_lang.h"
+#include "vlc_iso_lang.h"
 
 /* FIXME we should find a better way than including that */
 #include "../../src/text/iso-639_def.h"
diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index dc7d93970b..43bd24734f 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -38,7 +38,7 @@
 
 #include <vlc_interface.h>
 
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 
 #include "../demux/ps.h"
 
diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index c4d399e05a..9820a2f6e2 100644
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -43,7 +43,7 @@
 
 
 #include <vlc_codecs.h>               /* BITMAPINFOHEADER, WAVEFORMATEX */
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 #include "vlc_meta.h"
 #include <vlc_charset.h>
 #include <vlc_input.h>
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 2ada05222d..826c088d5c 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -36,7 +36,7 @@
 #include <vlc_playlist.h>
 #include <vlc_md5.h>
 #include <vlc_charset.h>
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 #include <vlc_meta.h>
 
 #include "libmp4.h"
diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index c7c14470af..68a61c5925 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -40,7 +40,7 @@
 #include <vlc_meta.h>
 #include <vlc_epg.h>
 
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 #include <vlc_network.h>
 #include <vlc_charset.h>
 
diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index 84f0a2e260..22322db090 100644
--- a/modules/mux/mp4.c
+++ b/modules/mux/mp4.c
@@ -39,7 +39,7 @@
 #include <time.h>
 #endif
 
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 #include "vlc_meta.h"
 
 /*****************************************************************************
diff --git a/modules/mux/mpeg/ps.c b/modules/mux/mpeg/ps.c
index 44a2eaca9f..2cbd5cf884 100644
--- a/modules/mux/mpeg/ps.c
+++ b/modules/mux/mpeg/ps.c
@@ -41,7 +41,7 @@
 #include "bits.h"
 #include "pes.h"
 
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 
 /*****************************************************************************
  * Module descriptor
diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index c46a718317..bd4b70b68b 100644
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -38,7 +38,7 @@
 #include <vlc_codecs.h>
 #include <vlc_block.h>
 
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 
 #include "bits.h"
 #include "pes.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 3ebc47945f..4e66c44d9b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -70,7 +70,6 @@ pluginsinclude_HEADERS = \
 	$(NULL)
 
 noinst_HEADERS = \
-	../include/iso_lang.h \
 	../include/mmx.h \
 	../include/vlc_aout.h \
 	../include/vlc_codec_synchro.h \
@@ -84,6 +83,7 @@ noinst_HEADERS = \
 	../include/vlc_input.h \
 	../include/vlc_interface.h \
 	../include/vlc_intf_strings.h \
+	../include/vlc_iso_lang.h \
 	../include/vlc_keys.h \
 	../include/vlc_network.h \
 	../include/vlc_osd.h \
diff --git a/src/input/es_out.c b/src/input/es_out.c
index 509c42c8b7..bbafad2aa6 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -41,7 +41,7 @@
 #include "input_internal.h"
 
 #include "vlc_playlist.h"
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 /* FIXME we should find a better way than including that */
 #include "../text/iso-639_def.h"
 
diff --git a/src/text/iso_lang.c b/src/text/iso_lang.c
index 00f2915754..a6bacb6aec 100644
--- a/src/text/iso_lang.c
+++ b/src/text/iso_lang.c
@@ -33,7 +33,7 @@
 
 #include <vlc/vlc.h>
 
-#include "iso_lang.h"
+#include "vlc_iso_lang.h"
 
 /*****************************************************************************
  * Local tables
-- 
2.39.2