vlc_modules_macros.h -> vlc_plugin.h

include/vlc_common.h

@@ -430,7 +430,7 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
 #  endif
 #endif
 
-#include "vlc_modules_macros.h"
+#include <vlc_plugin.h>
 
 /*****************************************************************************
  * OS-specific headers and thread types

src/Makefile.am

@@ -43,9 +43,9 @@ pluginsinclude_HEADERS = \
 	../include/vlc_main.h \
 	../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 \
 	../include/vlc_variables.h \
@@ -86,7 +86,6 @@ noinst_HEADERS = \
 	../include/vlc_osd.h \
 	../include/vlc_pgpkey.h \
 	../include/vlc_playlist.h \
-	../include/vlc_plugin.h \
 	../include/vlc_rand.h \
 	../include/vlc_services_discovery.h \
 	../include/vlc_sout.h \
@@ -171,6 +170,7 @@ endif
 libvlc_la_SOURCES = $(SOURCES_libvlc)
 nodist_libvlc_la_SOURCES = misc/revision.c
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+	-DMODULE_STRING=\"main\" \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DDATA_PATH=\"$(pkgdatadir)\" \
@@ -190,7 +190,8 @@ libvlc_la_DEPENDENCIES = libvlc.sym
 
 libvlc_control_la_SOURCES = $(SOURCES_libvlc_control)
 libvlc_control_la_LIBADD = libvlc.la
-libvlc_control_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
+libvlc_control_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+	-DMODULE_STRING=\"control\"
 libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 if HAVE_COMPILER_EXPORT
 libvlc_control_la_LDFLAGS += -export-dynamic

src/libvlc-module.c

@@ -35,6 +35,7 @@
 #endif
 
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include "libvlc.h"
 
 //#define Nothing here, this is just to prevent update-po from being stupid

src/modules/entry.c

@@ -24,6 +24,7 @@
 #endif
 
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <assert.h>
 #include <stdarg.h>
 

src/modules/modules.c

@@ -29,6 +29,7 @@
 #endif
 
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include "libvlc.h"
 
 /* Some faulty libcs have a broken struct dirent when _FILE_OFFSET_BITS

src/modules/os.c

@@ -29,6 +29,7 @@
 #endif
 
 #include <vlc/vlc.h>
+#include <vlc_plugin.h> /* MODULE_SUFFIX */
 #include "libvlc.h"
 #include "modules.h"
 
@@ -259,6 +260,8 @@ void module_Unload( module_handle_t handle )
 #elif defined(HAVE_DL_DLOPEN)
 # ifdef NDEBUG
     dlclose( handle );
+# else
+    (void)handle;
 # endif
 
 #elif defined(HAVE_DL_SHL_LOAD)

vlc-config.in.in

@@ -247,7 +247,7 @@ done
 #  If a module was requested, use its name
 #
 if test -n "${module}"; then
-  cppflags="${cppflags} -DMODULE_NAME=${module} -DMODULE_NAME_IS_${module}"
+  cppflags="${cppflags} -DMODULE_NAME=${module} -DMODULE_NAME_IS_${module} -DMODULE_STRING=\"${module}\""
 fi
 
 #