diff options
author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lib-src/pop.c | |
parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
download | emacs-25-merge.tar.gz |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lib-src/pop.c')
-rw-r--r-- | lib-src/pop.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib-src/pop.c b/lib-src/pop.c index c6deaf73a2c..42d302026ff 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c @@ -42,10 +42,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #endif #include <pop.h> -#ifdef sun -#include <malloc.h> -#endif /* sun */ - #ifdef HESIOD #include <hesiod.h> /* |