Changeset 0669643b1c7370abeda3799588825d46527f5897

Timestamp:

05/08/08 18:24:35 (4 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1210263875 +0300

git-parent:

[630076053112b47b2f6279b1e67a4031d2ca45b2]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1210262118 +0300

Message:

vlc_modules_macros.h -> vlc_plugin.h

Files:

• include/vlc_common.h (modified) (1 diff)
• include/vlc_modules_macros.h (deleted)
• include/vlc_plugin.h (modified) (2 diffs)
• src/Makefile.am (modified) (4 diffs)
• src/libvlc-module.c (modified) (1 diff)
• src/modules/entry.c (modified) (1 diff)
• src/modules/modules.c (modified) (1 diff)
• src/modules/os.c (modified) (2 diffs)
• vlc-config.in.in (modified) (1 diff)

include/vlc_common.h

@@ -431 +431 @@
-#endif
-
-"vlc_modules_macros.h"
+<vlc_plugin.h>
-
-/*****************************************************************************

include/vlc_plugin.h

@@ -1 +1 @@
-/*****************************************************************************
-plugin.h: LibVLC plugin macros
+vlc_plugin.h : Macros used from within a module.
- *****************************************************************************
-
-
+
+
+
+
- *
- * This program is free software; you can redistribute it and/or modify
@@ -20 +22 @@
- *****************************************************************************/
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/Makefile.am

@@ -44 +44 @@
-    ../include/vlc_messages.h \
-    ../include/vlc_modules.h \
-    ../include/vlc_modules_macros.h \
-    ../include/vlc_mtime.h \
-    ../include/vlc_objects.h \
+    ../include/vlc_plugin.h \
-    ../include/vlc_threads.h \
-    ../include/vlc_threads_funcs.h \
@@ -87 +87 @@
-    ../include/vlc_pgpkey.h \
-    ../include/vlc_playlist.h \
-    ../include/vlc_plugin.h \
-    ../include/vlc_rand.h \
-    ../include/vlc_services_discovery.h \
@@ -172 +171 @@
-nodist_libvlc_la_SOURCES = misc/revision.c
-libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+    -DMODULE_STRING=\"main\" \
-    -DLOCALEDIR=\"$(localedir)\" \
-    -DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -191 +191 @@
-libvlc_control_la_SOURCES = $(SOURCES_libvlc_control)
-libvlc_control_la_LIBADD = libvlc.la
-
+
+
-libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
-if HAVE_COMPILER_EXPORT

src/libvlc-module.c

@@ -36 +36 @@
-
-#include <vlc/vlc.h>
+#include <vlc_plugin.h>
-#include "libvlc.h"
-

src/modules/entry.c

@@ -25 +25 @@
-
-#include <vlc/vlc.h>
+#include <vlc_plugin.h>
-#include <assert.h>
-#include <stdarg.h>

src/modules/modules.c

@@ -30 +30 @@
-
-#include <vlc/vlc.h>
+#include <vlc_plugin.h>
-#include "libvlc.h"
-

src/modules/os.c

@@ -30 +30 @@
-
-#include <vlc/vlc.h>
+#include <vlc_plugin.h> /* MODULE_SUFFIX */
-#include "libvlc.h"
-#include "modules.h"
@@ -260 +261 @@
-# ifdef NDEBUG
-    dlclose( handle );
+# else
+    (void)handle;
-# endif
-

vlc-config.in.in

@@ -248 +248 @@
-#
-if test -n "${module}"; then
-
+ -DMODULE_STRING=\"${module}\"
-fi
-