Win32 vlc_w.*dir: declare internally

[vlc] / include / vlc_common.h

diff --git a/include/vlc_common.h b/include/vlc_common.h
index e135ea73cee571b53275f61bbd0a3e2deff777b1..a5a449e29338179a699bcf8a4293ee47f3ea4bb9 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -390,12 +390,10 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
 #if defined (WIN32) && defined (DLL_EXPORT)
 #  ifdef __cplusplus
 #    define VLC_PUBLIC_API extern "C" __declspec(dllexport)
-#    define VLC_PRIVATE_API extern "C" __declspec(dllexport)
 #    define   VLC_EXPORT( type, name, args ) extern "C" __declspec(dllexport) type name args
 #    define VLC_INTERNAL( type, name, args ) extern "C" type name args
 #  else
 #    define VLC_PUBLIC_API extern __declspec(dllexport)
-#    define VLC_PRIVATE_API extern __declspec(dllexport)
 #    define   VLC_EXPORT( type, name, args ) __declspec(dllexport) type name args
 #    define VLC_INTERNAL( type, name, args ) type name args
 #  endif
@@ -403,7 +401,6 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
 #  ifdef __cplusplus
 #    ifdef HAVE_ATTRIBUTE_VISIBILITY
 #      define VLC_PUBLIC_API extern "C" __attribute__((visibility("default")))
-#      define VLC_PRIVATE_API extern "C" __attribute__((visibility("default")))
 #      define   VLC_EXPORT( type, name, args ) extern "C" __attribute__((visibility("default"))) type name args
 #      define VLC_INTERNAL( type, name, args ) extern "C" __attribute__((visibility("hidden"))) type name args
 #    else
@@ -414,12 +411,10 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
 #  else
 #    ifdef HAVE_ATTRIBUTE_VISIBILITY
 #      define VLC_PUBLIC_API extern __attribute__((visibility("default")))
-#      define VLC_PRIVATE_API extern __attribute__((visibility("default")))
 #      define   VLC_EXPORT( type, name, args ) __attribute__((visibility("default"))) type name args
 #      define VLC_INTERNAL( type, name, args ) __attribute__((visibility("hidden"))) type name args
 #    else
 #      define VLC_PUBLIC_API extern
-#      define VLC_PRIVATE_API extern
 #      define   VLC_EXPORT( type, name, args ) extern type name args
 #      define VLC_INTERNAL( type, name, args ) type name args
 #    endif
@@ -695,19 +690,16 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw )
     SetDWBE( p, ( i_qw >> 32)&0xffffffff );
 }
 
+#define hton16(i) htons(i)
+#define hton32(i) htonl(i)
+#define ntoh16(i) ntohs(i)
+#define ntoh32(i) ntohl(i)
+
 #ifdef WORDS_BIGENDIAN
-#   define hton16(i)   ( i )
-#   define hton32(i)   ( i )
 #   define hton64(i)   ( i )
-#   define ntoh16(i)   ( i )
-#   define ntoh32(i)   ( i )
 #   define ntoh64(i)   ( i )
 #else
-#   define hton16(i)   U16_AT(&i)
-#   define hton32(i)   U32_AT(&i)
 #   define hton64(i)   U64_AT(&i)
-#   define ntoh16(i)   U16_AT(&i)
-#   define ntoh32(i)   U32_AT(&i)
 #   define ntoh64(i)   U64_AT(&i)
 #endif
 
@@ -762,25 +754,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 ) );
 
-#if defined (WIN32)
-#   include <dirent.h>
- VLC_INTERNAL( void *, vlc_wopendir, ( const wchar_t * ) );
- VLC_INTERNAL( struct _wdirent *, vlc_wreaddir, ( void * ) );
- VLC_EXPORT( int, vlc_wclosedir, ( void * ) );
- VLC_INTERNAL( void, vlc_rewinddir, ( void * ) );
- VLC_INTERNAL( void, vlc_seekdir, ( void *, long ) );
- VLC_INTERNAL( long, vlc_telldir, ( void * ) );
-#   define opendir Use_utf8_opendir_or_vlc_wopendir_instead!
-#   define readdir Use_utf8_readdir_or_vlc_wreaddir_instead!
-#   define closedir vlc_wclosedir
-#   define _wopendir vlc_wopendir
-#   define _wreaddir vlc_wreaddir
-#   define _wclosedir vlc_wclosedir
-#   define rewinddir vlc_rewinddir
-#   define seekdir vlc_seekdir
-#   define telldir vlc_telldir
-#endif
-
 #if defined(WIN32) || defined(UNDER_CE)
 /* win32, cl and icl support */
 #   if defined( _MSC_VER ) || !defined( __MINGW32__ )
@@ -842,7 +815,6 @@ VLC_EXPORT( char *, vlc_strcasestr, ( const char *s1, const char *s2 ) );
 #endif
 
 VLC_EXPORT( bool, vlc_ureduce, ( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t ) );
-VLC_EXPORT( char **, vlc_parse_cmdline, ( const char *, int * ) );
 
 /* vlc_wraptext (defined in src/extras/libc.c) */
 #define wraptext vlc_wraptext