- Don't override PACKAGE. It breaks.

- Don't undef off_t twice.

diff --git a/include/vlc_common.h b/include/vlc_common.h
index d36dd11eaaca3b23776c4a6d2440d3fe5be3eeef..3b4dd1c6e874b69cfd3500e3a720ab0048b813d0 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -41,7 +41,6 @@
 #   undef HAVE_VARIADIC_MACROS
 #   undef HAVE_STDINT_H
 #   undef HAVE_INTTYPES_H
-#   undef off_t
 #elif defined( _MSC_VER )
 #   pragma warning( disable : 4244 )
 #endif
@@ -1244,11 +1243,6 @@ VLC_EXPORT( const char *, VLC_Changeset, ( void ) );
 extern vlc_threadvar_t msg_context_global_key;
 
 
-#if defined( __BORLANDC__ )
-#   undef PACKAGE
-#   define PACKAGE
-#endif
-
 #if defined( WIN32 ) || defined( UNDER_CE )
 #   define DIR_SEP_CHAR '\\'
 #   define DIR_SEP "\\"