* ncurses compilation fix by Michael Mondragon <mammon@lokmail.net>. * fix for large inline functions and gcc 3.0. * fixed the gnome plugin so that it does not include gtk headers.

cc674725 · Sam Hocevar · 2cdf4603 · cc674725 · cc674725 · cc674725
Commit cc674725 authored Jul 25, 2001 by Sam Hocevar
12 changed files
--- a/configure
+++ b/configure
--- a/configure.in
+++ b/configure.in
@@ -110,6 +110,13 @@ void foo() { int meuh; ntohl(meuh); }],,
 AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if <sys/param.h> defines ntohl.)
 AC_MSG_RESULT(yes), AC_MSG_RESULT(no))

+dnl Check for inline function size limit
+CFLAGS="${save_CFLAGS} -finline-limit=12"
+AC_MSG_CHECKING([if \$CC accepts -finline-limit])
+AC_TRY_COMPILE([],,
+ save_CFLAGS="${save_CFLAGS} -finline-limit=31337"; AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no))
+
 dnl Check for Darwin plugin linking flags
 CFLAGS="${save_CFLAGS} -bundle -undefined suppress"
 AC_MSG_CHECKING([if \$CC compiles plugins with -bundle -undefined suppress])

--- a/plugins/gtk/Makefile
+++ b/plugins/gtk/Makefile
@@ -7,17 +7,19 @@
 # Objects
 #

-PLUGIN_GTK = gtk.o intf_gtk.o gtk_interface.o gtk_support.o
+PLUGIN_GTK = gtk.o intf_gtk.o gtk_interface.o gtk_support.o gtk_callbacks.o
 PLUGIN_GNOME = gnome.o intf_gnome.o gnome_interface.o gnome_support.o gnome_callbacks.o
-PLUGIN_GTKCOMMON = gtk_display.o gtk_callbacks.o gtk_open.o gtk_control.o gtk_menu.o gtk_playlist.o gtk_modules.o gtk_preferences.o
+
+PLUGIN_GTK_SPECIFIC = gtk_display.o gtk_open.o gtk_control.o gtk_menu.o gtk_playlist.o gtk_modules.o gtk_preferences.o
+PLUGIN_GNOME_SPECIFIC = $(PLUGIN_GTK_SPECIFIC:gtk%=gnome%)

 BUILTIN_GTK = $(PLUGIN_GTK:%.o=BUILTIN_GTK_%.o) \
-        $(PLUGIN_GTKCOMMON:%.o=BUILTIN_GTK_%.o)
+        $(PLUGIN_GTK_SPECIFIC:%.o=BUILTIN_GTK_%.o)
 BUILTIN_GNOME = $(PLUGIN_GNOME:%.o=BUILTIN_GNOME_%.o) \
-        $(PLUGIN_GTKCOMMON:%.o=BUILTIN_GNOME_%.o)
+        $(PLUGIN_GTK_SPECIFIC:%.o=BUILTIN_GNOME_%.o)

-ALL_OBJ = $(PLUGIN_GTK) $(PLUGIN_GNOME) $(PLUGIN_GTKCOMMON) \
-          $(BUILTIN_GTK) $(BUILTIN_GNOME)
+ALL_OBJ = $(PLUGIN_GTK) $(PLUGIN_GNOME) $(PLUGIN_GTK_SPECIFIC) \
+          $(PLUGIN_GNOME_SPECIFIC) $(BUILTIN_GTK) $(BUILTIN_GNOME)

 #
 # Virtual targets
@@ -25,22 +27,24 @@ ALL_OBJ = $(PLUGIN_GTK) $(PLUGIN_GNOME) $(PLUGIN_GTKCOMMON) \

 include ../../Makefile.modules

-$(PLUGIN_GTKCOMMON): %.o: .dep/%.d
-$(PLUGIN_GTKCOMMON): %.o: %.c
-	$(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_GTK) -DPLUGIN -c -o $@ $<
-
-$(PLUGIN_GTK): %.o: .dep/%.d
-$(PLUGIN_GTK): %.o: %.c
+# Gtk+
+$(PLUGIN_GTK) $(PLUGIN_GTK_SPECIFIC): %.o: .dep/%.d
+$(PLUGIN_GTK) $(PLUGIN_GTK_SPECIFIC): %.o: %.c
 	$(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_GTK) -DPLUGIN -DMODULE_NAME=gtk -c -o $@ $<

 $(BUILTIN_GTK): BUILTIN_GTK_%.o: .dep/%.d
 $(BUILTIN_GTK): BUILTIN_GTK_%.o: %.c
 	$(CC) $(CFLAGS) $(CFLAGS_GTK) -DBUILTIN -DMODULE_NAME=gtk -c -o $@ $<

+# Gnome
 $(PLUGIN_GNOME): %.o: .dep/%.d
 $(PLUGIN_GNOME): %.o: %.c
 	$(CC) $(CFLAGS) $(PCFLAGS) -DPLUGIN -DMODULE_NAME=gnome `gnome-config --cflags gtk gnomeui` -c -o $@ $<

+$(PLUGIN_GNOME_SPECIFIC): gnome%.o: .dep/gtk%.d
+$(PLUGIN_GNOME_SPECIFIC): gnome%.o: gtk%.c
+	$(CC) $(CFLAGS) $(PCFLAGS) -DPLUGIN -DMODULE_NAME=gnome `gnome-config --cflags gtk gnomeui` -c -o $@ $<
+
 $(BUILTIN_GNOME): BUILTIN_GNOME_%.o: .dep/%.d
 $(BUILTIN_GNOME): BUILTIN_GNOME_%.o: %.c
 	$(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=gnome `gnome-config --cflags gtk gnomeui` -c -o $@ $<
@@ -50,7 +54,7 @@ $(BUILTIN_GNOME): BUILTIN_GNOME_%.o: %.c
 # Real targets
 #

-../../plugins/gtk.so: $(PLUGIN_GTK) $(PLUGIN_GTKCOMMON)
+../../plugins/gtk.so: $(PLUGIN_GTK) $(PLUGIN_GTK_SPECIFIC)
 	$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GTK)

 ../../plugins/gtk.a: $(BUILTIN_GTK)
@@ -58,7 +62,7 @@ $(BUILTIN_GNOME): BUILTIN_GNOME_%.o: %.c
 	$(RANLIB) $@


-../../plugins/gnome.so: $(PLUGIN_GNOME) $(PLUGIN_GTKCOMMON)
+../../plugins/gnome.so: $(PLUGIN_GNOME) $(PLUGIN_GNOME_SPECIFIC)
 	$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GNOME)

 ../../plugins/gnome.a: $(BUILTIN_GNOME)

--- a/plugins/gtk/gtk_control.c
+++ b/plugins/gtk/gtk_control.c
@@ -2,7 +2,7 @@
 * gtk_control.c : functions to handle stream control buttons.
 *****************************************************************************
 * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_control.c,v 1.4 2001/05/30 17:03:12 sam Exp $
+ * $Id: gtk_control.c,v 1.5 2001/07/25 03:12:33 sam Exp $
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *          Stphane Borel <stef@via.ecp.fr>
@@ -29,7 +29,15 @@
 #include <sys/types.h>                                              /* off_t */
 #include <stdlib.h>

-#include <gtk/gtk.h>
+#define gtk 12
+#define gnome 42
+#if ( MODULE_NAME == gtk )
+#   include <gtk/gtk.h>
+#elif ( MODULE_NAME == gnome )
+#   include <gnome.h>
+#endif
+#undef gtk
+#undef gnome

 #include <string.h>


--- a/plugins/gtk/gtk_display.c
+++ b/plugins/gtk/gtk_display.c
@@ -2,7 +2,7 @@
 * gtk_display.c: Gtk+ tools for main interface
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: gtk_display.c,v 1.4 2001/05/30 23:02:03 stef Exp $
+ * $Id: gtk_display.c,v 1.5 2001/07/25 03:12:33 sam Exp $
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *          Stphane Borel <stef@via.ecp.fr>
@@ -32,7 +32,15 @@
 #include <string.h>                                            /* strerror() */
 #include <stdio.h>

-#include <gtk/gtk.h>
+#define gtk 12
+#define gnome 42
+#if ( MODULE_NAME == gtk )
+#   include <gtk/gtk.h>
+#elif ( MODULE_NAME == gnome )
+#   include <gnome.h>
+#endif
+#undef gtk
+#undef gnome

 #include "config.h"
 #include "common.h"

--- a/plugins/gtk/gtk_menu.c
+++ b/plugins/gtk/gtk_menu.c
@@ -2,7 +2,7 @@
 * gtk_menu.c : functions to handle menu items.
 *****************************************************************************
 * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_menu.c,v 1.12 2001/07/08 17:45:52 gbazin Exp $
+ * $Id: gtk_menu.c,v 1.13 2001/07/25 03:12:33 sam Exp $
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *          Stphane Borel <stef@via.ecp.fr>
@@ -29,7 +29,15 @@
 #include <sys/types.h>                                              /* off_t */
 #include <stdlib.h>

-#include <gtk/gtk.h>
+#define gtk 12
+#define gnome 42
+#if ( MODULE_NAME == gtk )
+#   include <gtk/gtk.h>
+#elif ( MODULE_NAME == gnome )
+#   include <gnome.h>
+#endif
+#undef gtk
+#undef gnome

 #include <string.h>


--- a/plugins/gtk/gtk_modules.c
+++ b/plugins/gtk/gtk_modules.c
@@ -2,7 +2,7 @@
 * gtk_modules.c : functions to build modules configuration boxes.
 *****************************************************************************
 * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_modules.c,v 1.3 2001/05/23 23:08:20 stef Exp $
+ * $Id: gtk_modules.c,v 1.4 2001/07/25 03:12:33 sam Exp $
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *          Stphane Borel <stef@via.ecp.fr>
@@ -29,7 +29,15 @@
 #include <sys/types.h>                                              /* off_t */
 #include <stdlib.h>

-#include <gtk/gtk.h>
+#define gtk 12
+#define gnome 42
+#if ( MODULE_NAME == gtk )
+#   include <gtk/gtk.h>
+#elif ( MODULE_NAME == gnome )
+#   include <gnome.h>
+#endif
+#undef gtk
+#undef gnome

 #include <string.h>


--- a/plugins/gtk/gtk_open.c
+++ b/plugins/gtk/gtk_open.c
@@ -2,7 +2,7 @@
 * gtk_open.c : functions to handle file/disc/network open widgets.
 *****************************************************************************
 * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_open.c,v 1.5 2001/05/30 23:02:04 stef Exp $
+ * $Id: gtk_open.c,v 1.6 2001/07/25 03:12:33 sam Exp $
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *          Stphane Borel <stef@via.ecp.fr>
@@ -29,7 +29,15 @@
 #include <sys/types.h>                                              /* off_t */
 #include <stdlib.h>

-#include <gtk/gtk.h>
+#define gtk 12
+#define gnome 42
+#if ( MODULE_NAME == gtk )
+#   include <gtk/gtk.h>
+#elif ( MODULE_NAME == gnome )
+#   include <gnome.h>
+#endif
+#undef gtk
+#undef gnome

 #include <string.h>


--- a/plugins/gtk/gtk_playlist.c
+++ b/plugins/gtk/gtk_playlist.c
@@ -2,7 +2,7 @@
 * gtk_playlist.c : Interface for the playlist dialog
 *****************************************************************************
 * Copyright (C) 2001 VideoLAN
- * $Id: gtk_playlist.c,v 1.17 2001/05/31 03:23:24 sam Exp $
+ * $Id: gtk_playlist.c,v 1.18 2001/07/25 03:12:33 sam Exp $
 *
 * Authors: Pierre Baillet <oct@zoy.org>
 *          Stphane Borel <stef@via.ecp.fr>
@@ -39,7 +39,15 @@
 #include <sys/stat.h>
 #include <unistd.h>

-#include <gtk/gtk.h>
+#define gtk 12
+#define gnome 42
+#if ( MODULE_NAME == gtk )
+#   include <gtk/gtk.h>
+#elif ( MODULE_NAME == gnome )
+#   include <gnome.h>
+#endif
+#undef gtk
+#undef gnome

 #include "config.h"
 #include "common.h"

--- a/plugins/gtk/gtk_preferences.c
+++ b/plugins/gtk/gtk_preferences.c
@@ -2,7 +2,7 @@
 * gtk_control.c : functions to handle stream control buttons.
 *****************************************************************************
 * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_preferences.c,v 1.5 2001/05/30 17:03:12 sam Exp $
+ * $Id: gtk_preferences.c,v 1.6 2001/07/25 03:12:33 sam Exp $
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *          Stphane Borel <stef@via.ecp.fr>
@@ -29,7 +29,15 @@
 #include <sys/types.h>                                              /* off_t */
 #include <stdlib.h>

-#include <gtk/gtk.h>
+#define gtk 12
+#define gnome 42
+#if ( MODULE_NAME == gtk )
+#   include <gtk/gtk.h>
+#elif ( MODULE_NAME == gnome )
+#   include <gnome.h>
+#endif
+#undef gtk
+#undef gnome

 #include <string.h>


--- a/plugins/text/intf_ncurses.c
+++ b/plugins/text/intf_ncurses.c
@@ -2,7 +2,7 @@
 * intf_ncurses.c: ncurses interface
 *****************************************************************************
 * Copyright (C) 2001 VideoLAN
- * $Id: intf_ncurses.c,v 1.3 2001/03/21 13:42:34 sam Exp $
+ * $Id: intf_ncurses.c,v 1.4 2001/07/25 03:12:33 sam Exp $
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *
@@ -41,7 +41,6 @@
 #include "threads.h"
 #include "mtime.h"
 #include "tests.h"
-#include "modules.h"

 #include "stream_control.h"
 #include "input_ext-intf.h"
@@ -49,8 +48,11 @@
 #include "intf_msg.h"
 #include "interface.h"

+#include "modules.h"
 #include "main.h"

+#include "modules_export.h"
+
 /*****************************************************************************
 * intf_sys_t: description and status of ncurses interface
 *****************************************************************************/

--- a/plugins/text/ncurses.c
+++ b/plugins/text/ncurses.c
@@ -2,7 +2,7 @@
 * ncurses.c : NCurses plugin for vlc
 *****************************************************************************
 * Copyright (C) 2001 VideoLAN
- * $Id: ncurses.c,v 1.5 2001/05/30 17:03:12 sam Exp $
+ * $Id: ncurses.c,v 1.6 2001/07/25 03:12:33 sam Exp $
 *
 * Authors: Samuel Hocevar <sam@zoy.org>
 *      
@@ -37,6 +37,7 @@
 #include "mtime.h"

 #include "modules.h"
+#include "modules_export.h"

 /*****************************************************************************
 * Capabilities defined in the other files.