smb.c: prevents problem with glibc defining open as a macro

diff --git a/modules/access/smb.c b/modules/access/smb.c
index e875c7cf6eea9fb319bb68ff11bc27a0bab73056..6da29f1ee96c12b13ace16c53acb7f8641132c0d 100644 (file)
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -226,7 +226,7 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    if( !(p_file = p_smb->open( p_smb, psz_uri, O_RDONLY, 0 )) )
+    if( !(p_file = (p_smb->open)( p_smb, psz_uri, O_RDONLY, 0 )) )
     {
         msg_Err( p_access, "open failed for '%s' (%s)",
                  p_access->psz_path, strerror(errno) );
@@ -251,6 +251,14 @@ static int Open( vlc_object_t *p_this )
     }
 #endif
 
+/*
+** some version of glibc defines open as a macro, causing havoc
+** with other macros using 'open' under the hood, such as the
+** following one:
+*/
+#if defined(smbc_open) && defined(open)
+# undef open
+#endif
     if( (i_smb = smbc_open( psz_uri, O_RDONLY, 0 )) < 0 )
     {
         msg_Err( p_access, "open failed for '%s' (%s)",