Undo previous change.

[bpt/emacs.git] / lib-src / fakemail.c

diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index 4a2618a..400861d 100644 (file)
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -15,7 +15,8 @@ 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
@@ -23,15 +24,17 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #if defined (BSD) && !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,6 +52,10 @@ main ()
 #undef close
 #endif
 
+#ifdef WINDOWSNT
+#include "ntlib.h"
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -182,7 +189,7 @@ xrealloc (ptr, size)
      int size;
 {
   long *result = (long *) realloc (ptr, ((unsigned) size));
-  if (result == ((char *) NULL))
+  if (result == ((long *) NULL))
     fatal ("virtual memory exhausted");
   return result;
 }
@@ -690,7 +697,7 @@ write_header (the_header)
   return;
 }
 \f
-void
+int
 main (argc, argv)
      int argc;
      char **argv;