diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2004-09-26 22:54:51 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2004-09-26 22:54:51 +0000 |
| commit | 9025bf7cc003e8e9981eaf2adc4c614d9bca765c (patch) | |
| tree | 2788c21b13ec9bfb2fbf2852ae7b4a6c6b764979 /src/xine-utils/xineutils.h | |
| parent | c4fcac1273c5be824b7468edcda160c38dec1692 (diff) | |
| download | xine-lib-9025bf7cc003e8e9981eaf2adc4c614d9bca765c.tar.gz xine-lib-9025bf7cc003e8e9981eaf2adc4c614d9bca765c.tar.bz2 | |
- almost finalize headers refactoring needed for MSVC frontends (and for other
poor platforms, of course)
- fix a bug in generated xine-config for WIN32 and make it relocateable
under Windows
- MSVC port: update, fix some warnings, remove old unneeded files
- improve function for getting runtime directory, it will need next fix
yet (bug probably due to active volume drives)
CVS patchset: 7001
CVS date: 2004/09/26 22:54:51
Diffstat (limited to 'src/xine-utils/xineutils.h')
| -rw-r--r-- | src/xine-utils/xineutils.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index 6a4be56bf..8e45d150a 100644 --- a/src/xine-utils/xineutils.h +++ b/src/xine-utils/xineutils.h @@ -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: xineutils.h,v 1.93 2004/09/20 19:30:05 valtri Exp $ + * $Id: xineutils.h,v 1.94 2004/09/26 22:54:53 valtri Exp $ * */ #ifndef XINEUTILS_H @@ -30,16 +30,17 @@ extern "C" { #include <stdlib.h> #include <string.h> #include <stdarg.h> -#include <inttypes.h> #include <pthread.h> #ifdef XINE_COMPILE +# include <inttypes.h> # include "attributes.h" # include "compat.h" # include "xmlparser.h" # include "xine_buffer.h" # include "configfile.h" #else +# include <xine/os_types.h> # include <xine/attributes.h> # include <xine/compat.h> # include <xine/xmlparser.h> @@ -849,7 +850,7 @@ void xine_hexdump (const char *buf, int length); #define lprintf(fmt, args...) do {} while(0) #else #ifdef _MSC_VER - #define lprintf +void __inline lprintf(const char * fmt, ...) {}; #else #define lprintf(...) do {} while(0) #endif /* _MSC_VER */ @@ -893,12 +894,8 @@ void xine_hexdump (const char *buf, int length); } while(0) #else #ifdef _MSC_VER - #define xprintf(xine, verbose, fmtargs) \ - do { \ - if((xine) && (xine)->verbosity >= verbose){ \ - xine_log(xine, XINE_LOG_TRACE, fmtargs); \ - } \ - } while(0) +void xine_xprintf(xine_t *xine, int verbose, const char *fmt, ...); + #define xprintf xine_xprintf #else #define xprintf(xine, verbose, ...) \ do { \ |