summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-12-26 16:13:21 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-12-26 16:13:21 +0000
commitd52f151b187a050797a0fd4d5f8ca8653fb9c3c6 (patch)
treeaa8cb12cfce85fafa5688f7f7ea08f8c8c448cfe /include
parentdea88a934f792fc7d152b2bfe9f3b5a8f8a3c201 (diff)
downloadxine-lib-d52f151b187a050797a0fd4d5f8ca8653fb9c3c6.tar.gz
xine-lib-d52f151b187a050797a0fd4d5f8ca8653fb9c3c6.tar.bz2
* cure the ABI breakage: XINE_LANG_MAX cannot be increased
* add TODO items to provide a better solution CVS patchset: 5950 CVS date: 2003/12/26 16:13:21
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am3
-rw-r--r--include/xine.h.in7
2 files changed, 8 insertions, 2 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 4523ae373..cda4494e0 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -17,3 +17,6 @@ maintainer-clean-generic:
-@echo "This command is intended for maintainers to use;"
-@echo "it deletes files that may require special tools to rebuild."
-rm -f Makefile.in
+
+install-data-local: install-includeHEADERS
+ sed -e '/^\/\*_x_/d' xine.h > $(DESTDIR)$(includedir)/xine.h
diff --git a/include/xine.h.in b/include/xine.h.in
index fba66fe01..04dbe621a 100644
--- a/include/xine.h.in
+++ b/include/xine.h.in
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine.h.in,v 1.111 2003/12/21 14:11:09 mroi Exp $
+ * $Id: xine.h.in,v 1.112 2003/12/26 16:13:22 mroi Exp $
*
* public xine-lib (libxine) interface and documentation
*
@@ -37,6 +37,8 @@
* use xlockdisplay() or use two seperate connections to the x-server
*
*/
+/*_x_ Lines formatted like this one are xine-lib developer comments. */
+/*_x_ They will be removed from the installed version of this header. */
#ifndef HAVE_XINE_H
#define HAVE_XINE_H
@@ -798,7 +800,8 @@ int xine_get_audio_lang (xine_stream_t *stream, int channel,
char *lang);
int xine_get_spu_lang (xine_stream_t *stream, int channel,
char *lang);
-#define XINE_LANG_MAX 128
+/*_x_ increasing this number means an incompatible ABI breakage! */
+#define XINE_LANG_MAX 32
/*
* get position / length information