Mercurial > audlegacy-plugins
changeset 1917:75ba6205aab3
Automated merge with ssh://sidhe.atheme.org//hg/audacious-plugins
| author | Jonathan Schleifer <js@h3c.de> |
|---|---|
| date | Sun, 30 Sep 2007 02:16:52 +0200 |
| parents | 9ea88bd211c2 (current diff) 271ed550c5b3 (diff) |
| children | abe974536163 |
| files | |
| diffstat | 4 files changed, 5 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lirc/about.c Sun Sep 30 02:16:32 2007 +0200 +++ b/src/lirc/about.c Sun Sep 30 02:16:52 2007 +0200 @@ -23,9 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <glib.h> #include <audacious/i18n.h>
--- a/src/lirc/lirc.c Sun Sep 30 02:16:32 2007 +0200 +++ b/src/lirc/lirc.c Sun Sep 30 02:16:52 2007 +0200 @@ -24,9 +24,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include <stdio.h> #include <unistd.h>
--- a/src/pulse_audio/pulse_audio.c Sun Sep 30 02:16:32 2007 +0200 +++ b/src/pulse_audio/pulse_audio.c Sun Sep 30 02:16:52 2007 +0200 @@ -17,9 +17,7 @@ USA. ***/ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "config.h" #include <stdio.h> #include <assert.h>
--- a/src/scrobbler/fmt.c Sun Sep 30 02:16:32 2007 +0200 +++ b/src/scrobbler/fmt.c Sun Sep 30 02:16:52 2007 +0200 @@ -10,7 +10,7 @@ char *fmt_escape(const char *str) { if (str == NULL) - return ""; + return NULL; return curl_escape(str, 0); } @@ -18,7 +18,7 @@ char *fmt_unescape(char *str) { if (str == NULL) - return ""; + return NULL; return curl_unescape(str, 0); }