summaryrefslogtreecommitdiff
path: root/lib-src/pop.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@twinsun.com>1999-10-19 07:17:20 +0000
committerPaul Eggert <eggert@twinsun.com>1999-10-19 07:17:20 +0000
commit4ee9629e2beb7a870ab30509d547b6845ef645cf (patch)
treeba84e985b8ba9da225ebba7cb9f3326556b335a4 /lib-src/pop.c
parent09ed9b3cac4585c1bcaf32c7aefd43e8112a4de7 (diff)
downloademacs-4ee9629e2beb7a870ab30509d547b6845ef645cf.tar.gz
Add support for large files. Merge glibc 2.1.2.
* b2m.c, emacsclient.c, emacsserver.c, fakemail.c, make-docfile.c, movemail.c, pop.c: Do not include <stdlib.h>, as <config.h> does this now. * b2m.c, emacsserver.c, etags.c, profile.c: Include <config.h> before any system include files. * emacsclient.c, emacsserver.c, fakemail.c, movemail.c, pop.c, test-distrib.c: (read, write, open, close): Do not undef. * getopt.c, getopt1.c: Adopt glibc 2.1.2, with the following fix: (const): Do not define if HAVE_CONFIG_H; that's config.h's job. * getopt.h: Adopt glibc 2.1.2.
Diffstat (limited to 'lib-src/pop.c')
-rw-r--r--lib-src/pop.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 57a5b197b0b..c6b86e5a2dc 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1,5 +1,5 @@
/* pop.c: client routines for talking to a POP3-protocol post-office server
- Copyright (c) 1991, 1993, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (c) 1991, 1993, 1996, 1997, 1999 Free Software Foundation, Inc.
Written by Jonathan Kamens, jik@security.ov.com.
This file is part of GNU Emacs.
@@ -28,14 +28,6 @@ Boston, MA 02111-1307, USA. */
#ifdef MAIL_USE_POP
-#ifdef HAVE_CONFIG_H
-/* Cancel these substitutions made in config.h */
-#undef open
-#undef read
-#undef write
-#undef close
-#endif
-
#include <sys/types.h>
#ifdef WINDOWSNT
#include "ntlib.h"
@@ -76,9 +68,6 @@ extern struct servent *hes_getservbyname (/* char *, char * */);
#include <string.h>
#define index strchr
#endif
-#ifdef STDC_HEADERS
-#include <stdlib.h>
-#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif