3 files changed, 29 insertions, 23 deletions
diff --git a/win32/include/msvc/config.h b/win32/include/msvc/config.h
index 8355d8569..886cf4762 100644
--- a/win32/include/msvc/config.h
+++ b/win32/include/msvc/config.h
@@ -6,12 +6,12 @@
  *    x86 disabled
  *    inline defined to __inline
  *    HAVE_SYS_PARAM_H disabled
- *    XINE_HOMEDIR
  *    XINE_PLUGINDIR
  *    XINE_FONTDIR
  *    XINE_LOCALEDIR
  *    HAVE_DLFCN_H 1
  *    HAVE_SETENV 1 (FIXME: into utils.c)
+ *    define ssize_t as __int64
  */
 
 #if defined(WIN32)
@@ -26,20 +26,6 @@
 #define PATH_MAX MAX_PATH
 #endif
 
-/* Ridiculous hack to return valid xine support
- * directories. These should be read from
- * a registry entry set at install time.
- */
-#define XINE_HOMEDIR	exec_path_append_subdir( 0 )
-#define XINE_PLUGINDIR  exec_path_append_subdir( "plugins" )
-#define XINE_FONTDIR  exec_path_append_subdir( "plugins" )
-#define XINE_LOCALEDIR  exec_path_append_subdir( "plugins" )
-
-#define S_ISDIR(m) ((m) & _S_IFDIR)
-#define S_ISREG(m) ((m) & _S_IFREG)
-#define S_ISBLK(m) 0
-#define S_ISCHR(m) 0
-
 #endif
 
 
diff --git a/win32/include/sys/socket.h b/win32/include/sys/socket.h
index be5d9a614..7786114a8 100755
--- a/win32/include/sys/socket.h
+++ b/win32/include/sys/socket.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2000-2001 the xine project
+ * Copyright (C) 2000-2004 the xine project
  * 
  * This file is part of xine, a unix video player.
  * 
@@ -34,4 +34,4 @@
 #define SIGALRM 14
 #endif
 
-#endif /* _SOCKET_H */
-\ No newline at end of file
+#endif /* _SOCKET_H */
diff --git a/win32/include/unistd.h b/win32/include/unistd.h
index a943dbffa..23776f772 100644
--- a/win32/include/unistd.h
+++ b/win32/include/unistd.h
@@ -45,23 +45,43 @@
 #define lstat			stat
 
 #ifndef S_ISDIR
-#define S_ISDIR(A)		( S_IFDIR & A )
+# define S_ISDIR(m) ((m) & _S_IFDIR)
 #endif
 
-#define S_IXUSR			S_IEXEC
-#define S_IXGRP			S_IEXEC
-#define S_IXOTH			S_IEXEC
+#ifndef S_ISDIR
+#  define S_ISREG(m) ((m) & _S_IFREG)
+#endif
+
+#ifndef S_ISDIR
+#  define S_ISBLK(m) 0
+#endif
+
+#ifndef S_ISDIR
+#  define S_ISCHR(m) 0
+#endif
+
+#ifndef S_IXUSR
+#  define S_IXUSR S_IEXEC
+#endif
+
+#ifndef S_IXGRP
+#  define S_IXGRP S_IEXEC
+#endif
+
+#ifndef S_IXOTH
+#  define S_IXOTH S_IEXEC
+#endif
 
 #define  M_PI			3.14159265358979323846  /* pi */
 
 #define bzero( A, B ) memset( A, 0, B )
 
 #ifndef strcasecmp
-#define strcasecmp _stricmp
+#  define strcasecmp _stricmp
 #endif
 
 #ifndef strncasecmp
-#define strncasecmp _strnicmp
+#  define strncasecmp _strnicmp
 #endif
 
 #define snprintf _snprintf