BeOS / gcc 2.x fixes, patch by Cian Duffy

[vlc] / include / os_specific.h

diff --git a/include/os_specific.h b/include/os_specific.h
index dafab02164c66082751859a2fe61c0527a235194..b58b0cf585e199f4cb841bb4d91a115a6fd5fdf5 100644 (file)
--- a/include/os_specific.h
+++ b/include/os_specific.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * os_specific.h: OS specific features
  *****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: os_specific.h,v 1.11 2003/09/29 17:36:34 gbazin Exp $
+ * Copyright (C) 2001 the VideoLAN team
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -11,7 +11,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef _NEED_OS_SPECIFIC_H
@@ -28,7 +28,7 @@
 
 #if defined( SYS_BEOS )
 #   include "beos_specific.h"
-#elif defined( SYS_DARWIN )
+#elif defined( __APPLE__ )
 #   include "darwin_specific.h"
 #elif defined( WIN32 ) || defined( UNDER_CE )
 #   include "win32_specific.h"
@@ -49,7 +49,7 @@ extern "C" {
     void system_End        ( vlc_t * );
 #else
 #   define system_Init( a, b, c ) {}
-#   define system_Configure( a ) {}
+#   define system_Configure( a, b, c ) {}
 #   define system_End( a ) {}
 #endif