From 594aa06631e10e4d7c7b2e8a19881f6d79365885 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pavel=20Jan=C3=ADk?= Date: Wed, 19 Dec 2001 07:26:31 +0000 Subject: [PATCH] Conditionally include config.h. Clean-up whitespaces. --- lib-src/ChangeLog | 2 ++ lib-src/fakemail.c | 16 +++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 31d929efd86..03be213e9a0 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -2,6 +2,8 @@ * emacsserver.c: Conditionally include config.h. + * fakemail.c: Likewise. + * emacsclient.c: Include "config.h", not <../src/config.h>. (main): Parenthesize assignment when used as truth value to prevent gcc warnings. diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c index 7ca3ae50d0d..dc5963c6400 100644 --- a/lib-src/fakemail.c +++ b/lib-src/fakemail.c @@ -20,7 +20,10 @@ Boston, MA 02111-1307, USA. */ #define NO_SHORTNAMES #define _XOPEN_SOURCE 500 /* for cuserid */ -#include + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #if defined (BSD_SYSTEM) && !defined (BSD4_1) && !defined (USE_FAKEMAIL) /* This program isnot used in BSD, so just avoid loader complaints. */ @@ -82,7 +85,7 @@ struct header_record struct header_record *previous; }; typedef struct header_record *header; - + struct stream_record { FILE *handle; @@ -203,8 +206,7 @@ init_linebuffer (linebuffer) } /* Read a line of text from `stream' into `linebuffer'. - * Return the length of the line. - */ + Return the length of the line. */ long readline (linebuffer, stream) @@ -619,13 +621,13 @@ parse_header (the_header, where) *where = '\0'; return; } - + /* Read lines from the input until we get a blank line. Create a list of `header' objects, one for each header field, each of which points to a list of `line_list' objects, one for each line in that field. Continuation lines are grouped in the headers they continue. */ - + header read_header () { @@ -725,7 +727,7 @@ main (argc, argv) command_line = alloc_string (name_length + args_size (the_header)); strcpy (command_line, mail_program_name); parse_header (the_header, &command_line[name_length]); - + the_pipe = popen (command_line, "w"); if (the_pipe == ((FILE *) NULL)) fatal ("cannot open pipe to real mailer"); -- 2.39.2