summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2010-02-05 17:59:02 +0100
committerDaniel Friesel <derf@derf.homelinux.org>2010-02-05 17:59:02 +0100
commit65f718fb58e5cfb2b74ec320a85197b2433f24cf (patch)
tree5ef02f38910ace87afb0ccc361542702a8c1d48f
parente1e9355dcd3ffd61e4cacf77fa682556b82dda06 (diff)
Apply 02_changeset_r46_compilation_fixes.patch from Debian
-rw-r--r--ChangeLog4
-rw-r--r--src/slideshow.c2
-rw-r--r--src/support.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5544659..83b505d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Aug 05 17:29:55 BST 2005 Tom Gilbert <tom@linuxbrit.co.uk>
+
+ * Patch from Matthias Drochner to fix compilation on older systems.
+
Sat Jul 23 00:30:09 BST 2005 Tom Gilbert <tom@linuxbrit.co.uk>
* Include the necessary jpegint header to get lossless rotation working in
diff --git a/src/slideshow.c b/src/slideshow.c
index 2ec05a8..d62f780 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -353,8 +353,8 @@ feh_action_run(feh_file * file, char *action)
D_ENTER(4);
if (action)
{
- D(3, ("Running action %s\n", action));
char *sys;
+ D(3, ("Running action %s\n", action));
sys = feh_printf(action, file);
if (opt.verbose && !opt.list && !opt.customlist)
diff --git a/src/support.c b/src/support.c
index 7f38f27..91dbe23 100644
--- a/src/support.c
+++ b/src/support.c
@@ -233,7 +233,7 @@ feh_wm_set_bg(char *fil, Imlib_Image im, int centered, int scaled,
char *path;
path = estrjoin("/", home, ".fehbg", NULL);
if ((fp = fopen(path, "w")) == NULL) {
- wprintf("Can't open %s for write", path);
+ weprintf("Can't open %s for write", path);
} else {
fprintf(fp, "%s\n", fehbg);
fclose(fp);