fix i18n under Windows and a C syntax error

Original commit message from CVS:
fix i18n under Windows and a C syntax error

diff --git a/ChangeLog b/ChangeLog
index 0e12efe..0576abc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
        * docs/manual/quotes.xml:
          Keep the quotes file alive

diff --git a/gst/gstplugin.c b/gst/gstplugin.c
index 8ac6b70..3eed73b 100644 (file)
--- a/gst/gstplugin.c
+++ b/gst/gstplugin.c
@@ -310,6 +310,7 @@ gst_plugin_check_file (const gchar * filename, GError ** error)
 {
   GModule *module;
   struct stat file_status;
+  gpointer ptr;
 
   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 ());
     return FALSE;
   }
-  gpointer ptr;
 
   if (!g_module_symbol (module, "gst_plugin_desc", &ptr)) {
     GST_DEBUG ("Could not find plugin entry point in \"%s\"", filename);

diff --git a/win32/config.h b/win32/config.h
index f9f65a2..d0d7eed 100644 (file)
--- a/win32/config.h
+++ b/win32/config.h
@@ -1,7 +1,7 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* always defined to indicate that i18n is enabled */
-#define ENABLE_NLS 1
+#define ENABLE_NLS 0
 
 /* gettext package name */
 #define GETTEXT_PACKAGE "gstreamer-0.8"

diff --git a/win32/gst-register.vcproj b/win32/gst-register.vcproj
index 90aac86..10c286c 100644 (file)
--- a/win32/gst-register.vcproj
+++ b/win32/gst-register.vcproj
@@ -21,7 +21,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                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"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -74,7 +74,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                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"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"

diff --git a/win32/vs7/gst-register.vcproj b/win32/vs7/gst-register.vcproj
index 90aac86..10c286c 100644 (file)
--- a/win32/vs7/gst-register.vcproj
+++ b/win32/vs7/gst-register.vcproj
@@ -21,7 +21,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                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"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -74,7 +74,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                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"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"