From 0f8fd3b22893dd07db6506a1ba4d298e51a1c985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Mon, 29 Aug 2005 15:28:16 +0000 Subject: *BUGFIX* Windows ports updates: - finished M$VC port update - moved xine plugins back to normal location for Windows ports, added relative directories (used relative to ${prefix}), make sure it's thread-safe (but it's still hacky) - fixed ugly bug with loading plugins, when working drive was differrent from plugins directory directory - directory and subdirectory separator called as platform specific - fix crash with newer win32 pthread (missing mutex_init in vo plugin), yes! - small doc update CVS patchset: 7712 CVS date: 2005/08/29 15:28:16 --- lib/os_internal.h | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'lib/os_internal.h') diff --git a/lib/os_internal.h b/lib/os_internal.h index 24d810ffd..0a5fbca72 100644 --- a/lib/os_internal.h +++ b/lib/os_internal.h @@ -4,6 +4,7 @@ #include #include "os_types.h" + #if defined (__SVR4) && defined (__sun) # include @@ -16,6 +17,19 @@ #endif +#if defined(WIN32) +# define XINE_DIRECTORY_SEPARATOR_STRING ";" +# define XINE_DIRECTORY_SEPARATOR_CHAR ';' +# define XINE_SUBDIRECTORY_SEPARATOR_STRING "\\" +# define XINE_SUBDIRECTORY_SEPARATOR_CHAR '\\' +#else +# define XINE_DIRECTORY_SEPARATOR_STRING ":" +# define XINE_DIRECTORY_SEPARATOR_CHAR ':' +# define XINE_SUBDIRECTORY_SEPARATOR_STRING "/" +# define XINE_SUBDIRECTORY_SEPARATOR_CHAR '/' +#endif + + /* replacement of strndup */ #ifndef HAVE_STRNDUP #define strndup(S, N) _xine_private_strndup((S), (N)) @@ -80,8 +94,12 @@ char *_xine_private_strsep(char **stringp, const char *delim); #endif #ifdef WIN32 -#include -# define mkdir(A, B) _mkdir((A)) +# include +# ifdef _MSC_VER +# include +# else +# define mkdir(A, B) _mkdir((A)) +# endif # ifndef S_ISDIR # define S_ISDIR(m) ((m) & _S_IFDIR) -- cgit v1.2.3