diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 00:38:22 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 00:38:22 +0200 |
| commit | 0ed2cd4f34189ec303dfac5a30de0abae0decba8 (patch) | |
| tree | 7a8d08d25ca7c81daa9d6cd65fd4f633fd676b41 /lib | |
| parent | 6081bc9a06ee97333769f77a9e5c18a15afb29da (diff) | |
| parent | 3dd7d925c2feb7868a49e7a1a0b953a5aab233f0 (diff) | |
| download | xine-lib-0ed2cd4f34189ec303dfac5a30de0abae0decba8.tar.gz xine-lib-0ed2cd4f34189ec303dfac5a30de0abae0decba8.tar.bz2 | |
Merge changes happened in 1.1 development.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/.hgignore (renamed from lib/.cvsignore) | 0 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/asprintf.c | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/lib/.cvsignore b/lib/.hgignore index 7d926a554..7d926a554 100644 --- a/lib/.cvsignore +++ b/lib/.hgignore diff --git a/lib/Makefile.am b/lib/Makefile.am index e2eec74c5..36b695bc8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -4,7 +4,7 @@ EXTRA_DIST = Makefile.common noinst_LTLIBRARIES = libxineposix.la noinst_HEADERS = os_internal.h -include_HEADERS = os_types.h +xineinclude_HEADERS = os_types.h libxineposix_la_SOURCES = libxineposix_la_LIBADD = @LTLIBOBJS@ diff --git a/lib/asprintf.c b/lib/asprintf.c index de6c5f9ed..6c9d90664 100644 --- a/lib/asprintf.c +++ b/lib/asprintf.c @@ -22,6 +22,7 @@ #include "config.h" #include <string.h> #include <stdlib.h> +#include <stdio.h> #include <stdarg.h> int xine_private_vasprintf (char **buffer, const char *format, va_list ap) |