Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ea78b882
Commit
ea78b882
authored
Jan 22, 2013
by
Paul Eggert
Browse files
Merge from gnulib.
parent
9d93ce29
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
19 deletions
+8
-19
ChangeLog
ChangeLog
+5
-0
lib/unistd.in.h
lib/unistd.in.h
+2
-18
src/unexmacosx.c
src/unexmacosx.c
+1
-1
No files found.
ChangeLog
View file @
ea78b882
2013-01-23 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-01-16 unistd: port to recent mingw
2013-01-19 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-arch-indep): Put back a chmod that was
...
...
lib/unistd.in.h
View file @
ea78b882
...
...
@@ -14,29 +14,13 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */
#ifndef _@GUARD_PREFIX@_UNISTD_H
#if __GNUC__ >= 3
@
PRAGMA_SYSTEM_HEADER
@
#endif
@
PRAGMA_COLUMNS
@
/* Special invocation convention:
- On mingw, several headers, including <winsock2.h>, include <unistd.h>,
but we need to ensure that both the system <unistd.h> and <winsock2.h>
are completely included before we replace gethostname. */
#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
&& !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H
/* <unistd.h> is being indirectly included for the first time from
<winsock2.h>; avoid declaring any overrides. */
# if @HAVE_UNISTD_H@
# @INCLUDE_NEXT@ @NEXT_UNISTD_H@
# else
# error unexpected; report this to bug-gnulib@gnu.org
# endif
# define _GL_WINSOCK2_H_WITNESS
/* Normal invocation. */
#elif !defined _@GUARD_PREFIX@_UNISTD_H
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_UNISTD_H@
# @INCLUDE_NEXT@ @NEXT_UNISTD_H@
...
...
src/unexmacosx.c
View file @
ea78b882
...
...
@@ -437,7 +437,7 @@ build_region_list (void)
}
#define MAX_UNEXEC_REGIONS
4
00
#define MAX_UNEXEC_REGIONS
8
00
static
int
num_unexec_regions
;
typedef
struct
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment