aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPaul Eggert2016-03-10 07:55:38 -0800
committerPaul Eggert2016-03-10 07:59:19 -0800
commit741a6f8ed4286e36f0c64256d7eda79e9c394f62 (patch)
treefd6c04f81f0771c360941576e520796499666c28 /lib
parent7352c6c695db8b90b63c2601277d64a32507d2bb (diff)
downloademacs-741a6f8ed4286e36f0c64256d7eda79e9c394f62.tar.gz
emacs-741a6f8ed4286e36f0c64256d7eda79e9c394f62.zip
Sync with gnulib
This incorporates: 2016-03-08 intprops: make .h file license match module 2016-03-08 acl: fix missing return on Cygwin 2016-03-05 extern-inline: port to PGI CC * doc/misc/texinfo.tex, lib/intprops.h, lib/set-permissions.c: * m4/extern-inline.m4: Copy from gnulib.
Diffstat (limited to 'lib')
-rw-r--r--lib/intprops.h8
-rw-r--r--lib/set-permissions.c1
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/intprops.h b/lib/intprops.h
index e1a6107b9c2..a278497b744 100644
--- a/lib/intprops.h
+++ b/lib/intprops.h
@@ -1,10 +1,10 @@
1/* intprops.h -- properties of integer types 1/* intprops.h -- properties of integer types
2 2
3 Copyright (C) 2001-2005, 2009-2016 Free Software Foundation, Inc. 3 Copyright (C) 2001-2016 Free Software Foundation, Inc.
4 4
5 This program is free software: you can redistribute it and/or modify 5 This program is free software: you can redistribute it and/or modify it
6 it under the terms of the GNU General Public License as published by 6 under the terms of the GNU General Public License as published
7 the Free Software Foundation; either version 3 of the License, or 7 by the Free Software Foundation; either version 3 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This program is distributed in the hope that it will be useful,
diff --git a/lib/set-permissions.c b/lib/set-permissions.c
index 073075434d6..2c773567cd6 100644
--- a/lib/set-permissions.c
+++ b/lib/set-permissions.c
@@ -269,6 +269,7 @@ set_acls_from_mode (const char *name, int desc, mode_t mode, bool *must_chmod)
269 } 269 }
270 return -1; 270 return -1;
271 } 271 }
272 return 0;
272 } 273 }
273} 274}
274 275