# HG changeset patch # User Juanma Barranquero # Date 1059430230 0 # Node ID 76d453ac3c4f46832743dd645755d3b2a55e9772 # Parent f1581f949f71c1aa8730c0008917ad466f4a517a (main): Fix having macros in a printf statement. diff -r f1581f949f71 -r 76d453ac3c4f lib-src/emacsclient.c --- a/lib-src/emacsclient.c Mon Jul 28 22:09:47 2003 +0000 +++ b/lib-src/emacsclient.c Mon Jul 28 22:10:30 2003 +0000 @@ -438,13 +438,13 @@ if (cwd == 0) { /* getwd puts message in STRING if it fails. */ - fprintf (stderr, "%s: %s (%s)\n", argv[0], + #ifdef HAVE_GETCWD - "Cannot get current working directory", + fprintf (stderr, "%s: %s (%s)\n", argv[0], + "Cannot get current working directory", strerror (errno)); #else - string, + fprintf (stderr, "%s: %s (%s)\n", argv[0], string, strerror (errno)); #endif - strerror (errno)); fail (argc, argv); } diff -r f1581f949f71 -r 76d453ac3c4f lib-src/movemail.c --- a/lib-src/movemail.c Mon Jul 28 22:09:47 2003 +0000 +++ b/lib-src/movemail.c Mon Jul 28 22:10:30 2003 +0000 @@ -228,13 +228,12 @@ #endif ) { +#ifdef MAIL_USE_POP fprintf (stderr, "Usage: movemail [-p] inbox destfile%s\n", -#ifdef MAIL_USE_POP - " [POP-password]" + " [POP-password]"); #else - "" + fprintf (stderr, "Usage: movemail [-p] inbox destfile%s\n", ""); #endif - ); exit (1); }