diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 00:44:49 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 00:44:49 +0100 |
| commit | c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af (patch) | |
| tree | b39027bf19757a904f9d306085d8744046f24a1f /include/xine/buffer.h | |
| parent | 119076c9300e2e2a816dc1a6ca32ba77f338b20c (diff) | |
| parent | a2a95425350da93551388acdca8a00818a34c317 (diff) | |
| download | xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.gz xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.bz2 | |
Merge from 1.2.
Diffstat (limited to 'include/xine/buffer.h')
| -rw-r--r-- | include/xine/buffer.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/xine/buffer.h b/include/xine/buffer.h index ce209c9da..4af718a1b 100644 --- a/include/xine/buffer.h +++ b/include/xine/buffer.h @@ -43,13 +43,8 @@ extern "C" { #include <pthread.h> #include <sys/types.h> -#ifdef XINE_COMPILE -# include <inttypes.h> -# include "attributes.h" -#else -# include <xine/os_types.h> -# include <xine/attributes.h> -#endif +#include <xine/os_types.h> +#include <xine/attributes.h> #define BUF_MAX_CALLBACKS 5 |