diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-27 13:52:33 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-27 13:52:33 +0100 |
| commit | d3801a2f741ac6931824bfef41ea0e7c39aa193d (patch) | |
| tree | 07a3ff7d13fb60a3b58ea87f5c1e3f80628b9f17 | |
| parent | 99a04ec01e35ff6e0c84195381ab55f2f8e04b9b (diff) | |
| download | xine-lib-d3801a2f741ac6931824bfef41ea0e7c39aa193d.tar.gz xine-lib-d3801a2f741ac6931824bfef41ea0e7c39aa193d.tar.bz2 | |
Move base64 header to xine-utils as we don't want it installed.
--HG--
rename : include/xine/base64.h => src/xine-utils/base64.h
| -rw-r--r-- | include/xine/xineutils.h | 1 | ||||
| -rw-r--r-- | src/input/input_cdda.c | 1 | ||||
| -rw-r--r-- | src/xine-engine/configfile.c | 1 | ||||
| -rw-r--r-- | src/xine-utils/Makefile.am | 1 | ||||
| -rw-r--r-- | src/xine-utils/base64.c | 2 | ||||
| -rw-r--r-- | src/xine-utils/base64.h (renamed from include/xine/base64.h) | 0 |
6 files changed, 4 insertions, 2 deletions
diff --git a/include/xine/xineutils.h b/include/xine/xineutils.h index 9fb1ad538..5f052ee58 100644 --- a/include/xine/xineutils.h +++ b/include/xine/xineutils.h @@ -47,7 +47,6 @@ extern "C" { #include <xine/list.h> #include <xine/array.h> #include <xine/sorted_array.h> -#include <xine/base64.h> #include <stdio.h> #include <string.h> diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 0e378c299..e2c32d509 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -69,6 +69,7 @@ #include <xine/xineutils.h> #include <xine/input_plugin.h> #include "media_helper.h" +#include "base64.h" #if defined(__sun) #define DEFAULT_CDDA_DEVICE "/vol/dev/aliases/cdrom0" diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index 550c0372f..8ac0e7eb3 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -33,6 +33,7 @@ #include <unistd.h> #include <xine/configfile.h> #include "bswap.h" +#include "base64.h" #define LOG_MODULE "configfile" #define LOG_VERBOSE diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index d3b4c2b1c..6509f1178 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -16,6 +16,7 @@ endif endif libxineutils_la_SOURCES = $(pppc_files) \ + base64.h \ base64.c \ cpu_accel.c \ color.c \ diff --git a/src/xine-utils/base64.c b/src/xine-utils/base64.c index 102f15256..583723cdc 100644 --- a/src/xine-utils/base64.c +++ b/src/xine-utils/base64.c @@ -92,7 +92,7 @@ #include <time.h> #include <stdlib.h> -#include <xine/base64.h> +#include "base64.h" /* NOTE: This is not true RFC822 anymore. The use of the characters diff --git a/include/xine/base64.h b/src/xine-utils/base64.h index 61d362150..61d362150 100644 --- a/include/xine/base64.h +++ b/src/xine-utils/base64.h |