diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-06-05 02:09:04 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-06-05 02:09:04 +0400 |
| commit | 415ee7d6e47dcb3e0906a7bebc6d52ab8ed899da (patch) | |
| tree | f7773ad82023c8616b339d84faa4bb7643af0311 /sysdeps/generic/malloc-machine.h | |
| parent | 3cc0cd4c5b3bed6f7d9aff26322d505785e11aa9 (diff) | |
| download | glibc-415ee7d6e47dcb3e0906a7bebc6d52ab8ed899da.tar.gz | |
Merged changes from kopensolaris-gnu project
http://git.csclub.uwaterloo.ca/?p=kopensolaris-gnu/glibc.git
Commits from 9157319 to bad8ac8.
This is only partial patch, some changes to not apply
and will be resovled and committed next.
Diffstat (limited to 'sysdeps/generic/malloc-machine.h')
| -rw-r--r-- | sysdeps/generic/malloc-machine.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sysdeps/generic/malloc-machine.h b/sysdeps/generic/malloc-machine.h index 03e9de5fd8..0fd22b73a0 100644 --- a/sysdeps/generic/malloc-machine.h +++ b/sysdeps/generic/malloc-machine.h @@ -1,3 +1,4 @@ +#warning FOO1 /* Basic platform-independent macro definitions for mutexes, thread-specific data and parameters for malloc. Copyright (C) 2003 Free Software Foundation, Inc. @@ -64,4 +65,8 @@ typedef void *tsd_key_t; # define DEFAULT_TOP_PAD 131072 #endif +#ifndef MALLOC_PROT_EXEC +# define MALLOC_PROT_EXEC 0 +#endif + #endif /* !defined(_GENERIC_MALLOC_MACHINE_H) */ |