diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dirent_msvc.c | 2 | ||||
| -rw-r--r-- | lib/os_internal.h | 22 |
2 files changed, 21 insertions, 3 deletions
diff --git a/lib/dirent_msvc.c b/lib/dirent_msvc.c index e36d7402c..b43fae1ae 100644 --- a/lib/dirent_msvc.c +++ b/lib/dirent_msvc.c @@ -19,7 +19,7 @@ */ #include "config.h" -#include <dirent.h> + #include <errno.h> #include <io.h> #include <stdlib.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 <stddef.h> #include "os_types.h" + #if defined (__SVR4) && defined (__sun) # include <sys/int_types.h> @@ -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 <io.h> -# define mkdir(A, B) _mkdir((A)) +# include <io.h> +# ifdef _MSC_VER +# include <direct.h> +# else +# define mkdir(A, B) _mkdir((A)) +# endif # ifndef S_ISDIR # define S_ISDIR(m) ((m) & _S_IFDIR) |