summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2012-12-14 21:43:12 +0200
committerEli Zaretskii <eliz@gnu.org>2012-12-14 21:43:12 +0200
commit7e90af267484ac6f286e91f55d38a31dd36c2395 (patch)
treec81da097740fc8d0f277a0f9f7a817b135d62522 /src
parent97976f9f3fcf588535bf4afad71de92860bb2f8e (diff)
downloademacs-7e90af267484ac6f286e91f55d38a31dd36c2395.tar.gz
Fix compilation warnings in the Windows build.
src/editfns.c [HAVE_PWD_H]: Include grp.h. src/makefile.w32-in ($(BLD)/editfns.$(O)): Add $(NT_INC)/grp.h.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/editfns.c1
-rw-r--r--src/makefile.w32-in1
3 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ff80763f351..d29988b39ba 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-14 Eli Zaretskii <eliz@gnu.org>
+
+ * editfns.c [HAVE_PWD_H]: Include grp.h.
+
+ * makefile.w32-in ($(BLD)/editfns.$(O)): Add $(NT_INC)/grp.h.
+
2012-12-14 Paul Eggert <eggert@cs.ucla.edu>
Fix permissions bugs with setgid directories etc. (Bug#13125)
diff --git a/src/editfns.c b/src/editfns.c
index 108c8b27187..911cd416e80 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -24,6 +24,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_PWD_H
#include <pwd.h>
+#include <grp.h>
#endif
#include <unistd.h>
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index facf79cf849..b595defdf6b 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -781,6 +781,7 @@ $(BLD)/editfns.$(O) : \
$(SRC)/editfns.c \
$(SRC)/blockinput.h \
$(NT_INC)/pwd.h \
+ $(NT_INC)/grp.h \
$(NT_INC)/unistd.h \
$(GNU_LIB)/intprops.h \
$(GNU_LIB)/strftime.h \