* libvlc.c: don't crash in vlc_iconv if vlc_iconv_open failed

 * sap.c: compilation fix
 * win32_graphics.cpp: avoid multiple #define

modules/gui/skins2/win32/win32_graphics.cpp

@@ -25,15 +25,16 @@
 #ifdef WIN32_SKINS
 
 #define WINVER 0x500
-#ifndef AC_SRC_ALPHA
-#define AC_SRC_ALPHA 1
-#endif
 
 #include "win32_factory.hpp"
 #include "win32_graphics.hpp"
 #include "win32_window.hpp"
 #include "../src/generic_bitmap.hpp"
 
+#ifndef AC_SRC_ALPHA
+#define AC_SRC_ALPHA 1
+#endif
+
 Win32Graphics::Win32Graphics( intf_thread_t *pIntf, int width, int height ):
     OSGraphics( pIntf ), m_width( width ), m_height( height ), m_hDC( NULL )
 {

src/libvlc.c

@@ -1843,6 +1843,12 @@ static void LocaleInit( void )
         vlc_mutex_init( p_libvlc, &libvlc.to_locale_lock );
         libvlc.from_locale = vlc_iconv_open( "UTF-8", psz_charset );
         libvlc.to_locale = vlc_iconv_open( psz_charset, "UTF-8" );
+        if( !libvlc.to_locale )
+        {
+            // Not sure it is the right thing to do, but at least it
+            // doesn't make vlc crash with msvc !
+            libvlc.to_locale = (vlc_iconv_t)(-1);
+        }
     }
     else
         libvlc.from_locale = libvlc.to_locale = (vlc_iconv_t)(-1);

src/stream_output/sap.c

@@ -620,7 +620,7 @@ static char *SDPGenerate( sap_handler_t *p_sap,
                             psz_uri, p_session->i_ttl,
                             p_session->i_port, p_session->i_payload,
                             psz_group ? "a=x-plgroup:" : "",
-                            psz_group ?: "", psz_group ? "\r\n" : "" ) == -1 )
+                            psz_group ? psz_group : "", psz_group ? "\r\n" : "" ) == -1 )
         return NULL;
     
     msg_Dbg( p_sap, "Generated SDP (%i bytes):\n%s", strlen(psz_sdp),