From f688e667064d42a7a6f4a5be62a3ceb48c1d1557 Mon Sep 17 00:00:00 2001
From: Gildas Bazin <gbazin@videolan.org>
Date: Sun, 11 Aug 2002 08:30:01 +0000
Subject: [PATCH] * src/misc/configuration.c: bugfix (don't initialize and free
 p_module->object_lock twice). * src/misc/win32_specific.c: missing
 initializations. * modules/demux/mp4/libmp4.c: was missing an #ifdef
 HAVE_ZLIB_H

---
 modules/demux/mp4/libmp4.c | 4 +++-
 src/misc/configuration.c   | 8 +-------
 src/misc/win32_specific.c  | 5 ++++-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 49999c29dd..aafc859353 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -2,7 +2,7 @@
  * libmp4.c : LibMP4 library for mp4 module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: libmp4.c,v 1.2 2002/08/10 20:05:21 fenrir Exp $
+ * $Id: libmp4.c,v 1.3 2002/08/11 08:30:01 gbazin Exp $
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -1760,7 +1760,9 @@ int MP4_ReadBox_cmov( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
     
     MP4_Box_t *p_dcom;
     MP4_Box_t *p_cmvd;
+#ifdef HAVE_ZLIB_H
     z_stream  z_data;
+#endif
     u8 *p_data;
     
     int i_result;
diff --git a/src/misc/configuration.c b/src/misc/configuration.c
index 95bc13217c..03c325ed28 100644
--- a/src/misc/configuration.c
+++ b/src/misc/configuration.c
@@ -2,7 +2,7 @@
  * configuration.c management of the modules configuration
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: configuration.c,v 1.35 2002/08/08 00:35:11 sam Exp $
+ * $Id: configuration.c,v 1.36 2002/08/11 08:30:01 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -325,9 +325,6 @@ void config_Duplicate( module_t *p_module, module_config_t *p_orig )
         return;
     }
 
-    /* Initialize the global lock */
-    vlc_mutex_init( p_module, &p_module->object_lock );
-
     /* Do the duplication job */
     for( i = 0; i < i_lines ; i++ )
     {
@@ -408,9 +405,6 @@ void config_Free( module_t *p_module )
 
     free( p_module->p_config );
     p_module->p_config = NULL;
-
-    /* Remove the global lock */
-    vlc_mutex_destroy( &p_module->object_lock );
 }
 
 /*****************************************************************************
diff --git a/src/misc/win32_specific.c b/src/misc/win32_specific.c
index 513737bcc6..d428fcded1 100644
--- a/src/misc/win32_specific.c
+++ b/src/misc/win32_specific.c
@@ -2,7 +2,7 @@
  * win32_specific.c: Win32 specific features 
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: win32_specific.c,v 1.13 2002/07/29 19:05:47 gbazin Exp $
+ * $Id: win32_specific.c,v 1.14 2002/08/11 08:30:01 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -59,6 +59,9 @@ void system_Init( vlc_t *p_this, int *pi_argc, char *ppsz_argv[] )
         fprintf( stderr, "error: can't initiate WinSocks, error %i\n", i_err );
     }
 
+    p_this->p_vlc->b_fast_mutex = 0;
+    p_this->p_vlc->i_win9x_cv = 0;
+
     _fmode = _O_BINARY;  /* sets the default file-translation mode */
 }
 
-- 
2.39.2