fix i18n under Windows and a C syntax error

Original commit message from CVS:
fix i18n under Windows and a C syntax error
This commit is contained in:
Steve Lhomme 2004-07-12 19:32:30 +00:00
parent 1fe4df4a62
commit 766d02d57a
5 changed files with 14 additions and 6 deletions

View file

@ -1,3 +1,11 @@
2004-07-12 Steve Lhomme <steve.lhomme@free.fr>
* gst/gstplugin.c:
Fix an impossible C syntax
* win32/config.h:
Disable i18n under Windows for the moment
* win32/gst-register.vcproj:
Use this configuration
2004-07-12 Jan Schmidt <thaytan@mad.scientis.com> 2004-07-12 Jan Schmidt <thaytan@mad.scientis.com>
* docs/manual/quotes.xml: * docs/manual/quotes.xml:
Keep the quotes file alive Keep the quotes file alive

View file

@ -310,6 +310,7 @@ gst_plugin_check_file (const gchar * filename, GError ** error)
{ {
GModule *module; GModule *module;
struct stat file_status; struct stat file_status;
gpointer ptr;
g_return_val_if_fail (filename != NULL, FALSE); g_return_val_if_fail (filename != NULL, FALSE);
@ -336,7 +337,6 @@ gst_plugin_check_file (const gchar * filename, GError ** error)
"Error loading plugin %s, reason: %s\n", filename, g_module_error ()); "Error loading plugin %s, reason: %s\n", filename, g_module_error ());
return FALSE; return FALSE;
} }
gpointer ptr;
if (!g_module_symbol (module, "gst_plugin_desc", &ptr)) { if (!g_module_symbol (module, "gst_plugin_desc", &ptr)) {
GST_DEBUG ("Could not find plugin entry point in \"%s\"", filename); GST_DEBUG ("Could not find plugin entry point in \"%s\"", filename);

View file

@ -1,7 +1,7 @@
/* config.h.in. Generated from configure.ac by autoheader. */ /* config.h.in. Generated from configure.ac by autoheader. */
/* always defined to indicate that i18n is enabled */ /* always defined to indicate that i18n is enabled */
#define ENABLE_NLS 1 #define ENABLE_NLS 0
/* gettext package name */ /* gettext package name */
#define GETTEXT_PACKAGE "gstreamer-0.8" #define GETTEXT_PACKAGE "gstreamer-0.8"

View file

@ -21,7 +21,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32" AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
MinimalRebuild="TRUE" MinimalRebuild="TRUE"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -74,7 +74,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32" AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG;HAVE_CONFIG_H"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"

View file

@ -21,7 +21,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32" AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
MinimalRebuild="TRUE" MinimalRebuild="TRUE"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -74,7 +74,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32" AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG;HAVE_CONFIG_H"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"