(Fgarbage_collect):

[gnu-emacs] / lib-src / fakemail.c

diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index 6e0cca22e58e33cef9e51c94bf5d1d0d4961ef10..73898c6fb87d3b964e99431cb9d4862b880cb697 100644 (file)
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -15,23 +15,26 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #define NO_SHORTNAMES
 #include <../src/config.h>
 
-#if defined (BSD) && !defined (BSD4_1) && !defined (USE_FAKEMAIL)
+#if defined (BSD_SYSTEM) && !defined (BSD4_1) && !defined (USE_FAKEMAIL)
 /* This program isnot used in BSD, so just avoid loader complaints.  */
-void
+int
 main ()
 {
+  return 0;
 }
 #else /* not BSD 4.2 (or newer) */
 #ifdef MSDOS
-void
+int
 main ()
 {
+  return 0;
 }
 #else /* not MSDOS */
 /* This conditional contains all the rest of the file.  */
@@ -49,11 +52,20 @@ main ()
 #undef close
 #endif
 
+#ifdef WINDOWSNT
+#include "ntlib.h"
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <time.h>
 #include <pwd.h>
+
+/* This is to declare cuserid.  */
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 \f
 /* Type definitions */
 
@@ -361,9 +373,9 @@ make_file_preface ()
   user_length = strlen (temp);
   the_user = alloc_string (user_length + 1);
   strcpy (the_user, temp);
-  the_string = alloc_string (3 + prefix_length +
-                            user_length +
-                            date_length);
+  the_string = alloc_string (3 + prefix_length
+                            + user_length
+                            + date_length);
   temp = the_string;
   strcpy (temp, FROM_PREFIX);
   temp = &temp[prefix_length];
@@ -690,7 +702,7 @@ write_header (the_header)
   return;
 }
 \f
-void
+int
 main (argc, argv)
      int argc;
      char **argv;