Changeset beee3221da8d2f81ff6142269d875ea59e6fd5f3

Timestamp:

05/01/08 22:11:42 (3 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1209672702 +0300

git-parent:

[4b8ce41a01d64ef213fde735fc73e6323aa0cdee]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1209672702 +0300

Message:

Move dirent stuff to fixups.h, where it belongs

Files:

• include/vlc_common.h (modified) (1 diff)
• include/vlc_fixups.h (modified) (1 diff)

include/vlc_common.h

@@ -774 +774 @@
-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>

include/vlc_fixups.h

@@ -122 +122 @@
-#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 */