Move dirent stuff to fixups.h, where it belongs

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 60406f20293daab700d387e0b2b3140ded511811..05d98ac54c8cfe883e285ba2398ec1cc3af66a51 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -773,32 +773,6 @@ VLC_EXPORT( int, vlc_strcasecmp, ( const char *s1, const char *s2 ) );
 VLC_EXPORT( int, vlc_strncasecmp, ( const char *s1, const char *s2, size_t n ) );
 VLC_EXPORT( char *, vlc_strcasestr, ( const char *s1, const char *s2 ) );
 
-#ifndef HAVE_DIRENT_H
-    typedef void DIR;
-#   ifndef FILENAME_MAX
-#       define FILENAME_MAX (260)
-#   endif
-    struct dirent
-    {
-        long            d_ino;          /* Always zero. */
-        unsigned short  d_reclen;       /* Always zero. */
-        unsigned short  d_namlen;       /* Length of name in d_name. */
-        char            d_name[FILENAME_MAX]; /* File name. */
-    };
-#   define opendir vlc_opendir
-#   define readdir vlc_readdir
-#   define closedir vlc_closedir
-#   define rewinddir vlc_rewindir
-#   define seekdir vlc_seekdir
-#   define telldir vlc_telldir
-    VLC_EXPORT( void *, vlc_opendir, ( const char * ) );
-    VLC_EXPORT( void *, vlc_readdir, ( void * ) );
-    VLC_EXPORT( int, vlc_closedir, ( void * ) );
-    VLC_INTERNAL( void, vlc_rewinddir, ( void * ) );
-    VLC_INTERNAL( void, vlc_seekdir, ( void *, long ) );
-    VLC_INTERNAL( long, vlc_telldir, ( void * ) );
-#endif
-
 #if defined (WIN32)
 #   include <dirent.h>
  VLC_INTERNAL( void *, vlc_wopendir, ( const wchar_t * ) );

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index fa50cb650dc047bec9430e0e5bd516c312002f67..98c167a46ad347f949287b928ca9fba51e6d0be5 100644 (file)
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -121,4 +121,30 @@ static inline struct tm *localtime_r (const time_t *timep, struct tm *result)
 }
 #endif
 
+#ifndef HAVE_DIRENT_H
+typedef void DIR;
+#   ifndef FILENAME_MAX
+#       define FILENAME_MAX (260)
+#   endif
+struct dirent
+{
+    long            d_ino;          /* Always zero. */
+    unsigned short  d_reclen;       /* Always zero. */
+    unsigned short  d_namlen;       /* Length of name in d_name. */
+    char            d_name[FILENAME_MAX]; /* File name. */
+};
+#   define opendir vlc_opendir
+#   define readdir vlc_readdir
+#   define closedir vlc_closedir
+#   define rewinddir vlc_rewindir
+#   define seekdir vlc_seekdir
+#   define telldir vlc_telldir
+VLC_EXPORT( void *, vlc_opendir, ( const char * ) );
+VLC_EXPORT( void *, vlc_readdir, ( void * ) );
+VLC_EXPORT( int, vlc_closedir, ( void * ) );
+VLC_INTERNAL( void, vlc_rewinddir, ( void * ) );
+VLC_INTERNAL( void, vlc_seekdir, ( void *, long ) );
+VLC_INTERNAL( long, vlc_telldir, ( void * ) );
+#endif
+
 #endif /* !LIBVLC_FIXUPS_H */