* modules/access/vcd/cdrom.c: small win32 bugfix.

* configure.ac.in: on win32 we link ws2_32 with the slp plugin.

diff --git a/configure.ac.in b/configure.ac.in
index c46b650c667ed1c9d5e9e738bdf9b13c54e7f99c..e617b1078f962f101806f209ac6bb1d68fc5a4c3 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -2607,6 +2607,9 @@ then
     then
       PLUGINS="${PLUGINS} slp"
       LDFLAGS_slp="${LDFLAGS_slp} -lslp"
+      if test "x${SYS}" != "xmingw32"; then
+        LDFLAGS_slp="${LDFLAGS_slp} -lws2_32"
+      fi
     fi
   else
     AC_MSG_CHECKING(for slp headers in ${with_slp})
@@ -2616,6 +2619,9 @@ then
       AC_MSG_RESULT(yes)
       PLUGINS="${PLUGINS} slp"
       LDFLAGS_slp="${LDFLAGS_slp} -L${with_slp} -lslp"
+      if test "x${SYS}" != "xmingw32"; then
+        LDFLAGS_slp="${LDFLAGS_slp} -lws2_32"
+      fi
       CPPFLAGS_slp="${CPPFLAGS_slp} -I${with_slp}"
     else
       dnl  No libslp could be found, sorry

diff --git a/modules/access/vcd/cdrom.c b/modules/access/vcd/cdrom.c
index ff804d5d6fa18201d2059b3d114a7b367656942e..4a7a3ecc2bd6af19504b95fc33c69c763dcaf339 100644 (file)
--- a/modules/access/vcd/cdrom.c
+++ b/modules/access/vcd/cdrom.c
@@ -2,7 +2,7 @@
  * cdrom.c: cdrom tools
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: cdrom.c,v 1.7 2003/01/27 21:35:06 jobi Exp $
+ * $Id: cdrom.c,v 1.8 2003/03/10 00:12:53 gbazin Exp $
  *
  * Authors: Johan Bilien <jobi@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -1198,7 +1198,7 @@ static int win32_vcd_open( vlc_object_t * p_this, const char *psz_dev,
                   else
                   {
                       FreeLibrary( hASPI );
-                      msg_Dbg( p_this, "%s: is not a cdrom drive",
+                      msg_Dbg( p_this, "%c: is not a cdrom drive",
                                psz_dev[0] );
                       return -1;
                   }