From 72279493cc35c01b488884687fcbe0a0d12beaa5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 20 Aug 2012 19:48:10 +0300 Subject: [PATCH] Improve MS-Windows related commentary and log entry for 2012-08-19T21:00:09Z!eggert@cs.ucla.edu. --- src/ChangeLog | 2 ++ src/conf_post.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 1e25015da20..bdfb4e3fcb1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -42,6 +42,8 @@ Rely on + to declare 'environ', as gnulib does this if the system doesn't. * callproc.c, editfns.c, process.c (environ) [!USE_CRT_DLL]: + Remove declaration. MS-Windows declares it on stdlib.h which is + included by conf_post.h. * emacs.c (environ) [DOUG_LEA_MALLOC]: * vm-limit.c (environ) [ORDINARY_LINK]: Remove decl. * vm-limit.c: Include , for 'environ'. diff --git a/src/conf_post.h b/src/conf_post.h index ead7298e98d..f90ef90fb83 100644 --- a/src/conf_post.h +++ b/src/conf_post.h @@ -178,6 +178,9 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ #endif #include +/* If you think about removing the line below, note that the + MS-Windows build relies on it for declaration of 'environ' needed + by a few source files. */ #include #if __GNUC__ >= 3 /* On GCC 3.0 we might get a warning. */ -- 2.39.5