diff lib-src/fakemail.c @ 4765:1257b938f03a

automatic merge
author Stephen J. Turnbull <stephen@xemacs.org>
date Fri, 04 Dec 2009 10:59:45 +0900
parents aa5ed11f473b
children 8b63e21b0436
line wrap: on
line diff
--- a/lib-src/fakemail.c	Fri Dec 04 10:56:38 2009 +0900
+++ b/lib-src/fakemail.c	Fri Dec 04 10:59:45 2009 +0900
@@ -131,10 +131,7 @@
 #define MY_NAME "fakemail"
 #define NIL ((line_list) NULL)
 #define INITIAL_LINE_SIZE 200
-
-#ifndef MAIL_PROGRAM_NAME
 #define MAIL_PROGRAM_NAME "/bin/mail"
-#endif
 
 static const char *my_name;
 static char *the_date;
@@ -633,14 +630,14 @@
   char *command_line;
   header the_header;
   long name_length;
-  char *mail_program_name;
+  const char *mail_program_name;
   char buf[BUFLEN + 1];
   register int size;
   FILE *the_pipe;
 
   mail_program_name = getenv ("FAKEMAILER");
   if (!(mail_program_name && *mail_program_name))
-    mail_program_name = (char *) MAIL_PROGRAM_NAME;
+    mail_program_name = MAIL_PROGRAM_NAME;
   name_length = strlen (mail_program_name);
 
   my_name = MY_NAME;