changeset 2800:f42a5b531c03 trunk

[svn] - hide 'error' from outside to avoid symbol conflict.
author yaz
date Thu, 24 May 2007 04:50:48 -0700
parents febdfe7a482b
children 8ab12f092722
files ChangeLog src/audacious/build_stamp.c src/libaudclient/audctrl.c
diffstat 3 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu May 24 03:41:13 2007 -0700
+++ b/ChangeLog	Thu May 24 04:50:48 2007 -0700
@@ -1,3 +1,11 @@
+2007-05-24 10:41:13 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4624]
+  - improve plugin2 loader's robustness (e.g. make it not crash)
+  
+  trunk/src/audacious/pluginenum.c |   47 +++++++++++++++++++++++++--------------
+  1 file changed, 31 insertions(+), 16 deletions(-)
+
+
 2007-05-24 10:37:54 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [4622]
   - temporarily work around plugin API v1 retardation
--- a/src/audacious/build_stamp.c	Thu May 24 03:41:13 2007 -0700
+++ b/src/audacious/build_stamp.c	Thu May 24 04:50:48 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070524-4622";
+const gchar *svn_stamp = "20070524-4624";
--- a/src/libaudclient/audctrl.c	Thu May 24 03:41:13 2007 -0700
+++ b/src/libaudclient/audctrl.c	Thu May 24 04:50:48 2007 -0700
@@ -28,7 +28,7 @@
 #include "audacious/dbus-client-bindings.h"
 #include "audctrl.h"
 
-GError *error = NULL;
+static GError *error = NULL; //it must be hidden from outside, otherwise symbol conflict likely to happen.
 
 /**
  * audacious_remote_playlist: