Changeset e4c0e92a1f78b19caf0f13b02198b37b9f8144cd

Timestamp:

24/05/08 10:04:59 (6 months ago)

Author:

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

git-committer:

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

git-parent:

[0b3174ed6e6940bc628544e7effed4ff90f5a7fa]

git-author:

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

Message:

vlc_.*dir: declare internally, as it's only used with libvlc

Files:

• include/vlc_fixups.h (modified) (1 diff)
• src/libvlc.h (modified) (1 diff)
• src/libvlccore.sym (modified) (2 diffs)

include/vlc_fixups.h

@@ -130 +130 @@
-#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
-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 * ) );
-#endif
-
-#ifndef HAVE_USELOCALE
-typedef void *locale_t;

src/libvlc.h

@@ -253 +253 @@
-void var_OptionParse (vlc_object_t *, const char *, bool trusted);
-
+/*
+ * Replacement functions
+ */
+# 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
+void *vlc_opendir (const char *);
+void *vlc_readdir (void *);
+int   vlc_closedir(void *);
+void  vlc_rewinddir(void *);
+# endif
+
-#endif

src/libvlccore.sym

@@ -380 +380 @@
-vlc_b64_encode_binary
-VLC_Changeset
-vlc_closedir
-VLC_CompileBy
-VLC_CompileDomain
@@ -438 +437 @@
-__vlc_object_waitpipe
-__vlc_object_yield
-vlc_opendir
-vlc_pthread_fatal
-vlc_rand_bytes
-vlc_readdir
-vlc_recvmsg
-vlc_scandir