diff options
| author | Bill Wohler | 2012-12-08 17:19:00 -0800 |
|---|---|---|
| committer | Bill Wohler | 2012-12-08 17:19:00 -0800 |
| commit | e1b489df7af8f7034f8c2ef275b786e93a39df31 (patch) | |
| tree | 2edc9307185e2c77b98fe75f6d7eb0476c58c7e3 /src/gmalloc.c | |
| parent | ce974958f93ffa2e1bd01b4dd85dcb8ec1395787 (diff) | |
| parent | c6c08d3f8fe4d2c9e588189e46d60a30ef3e8d20 (diff) | |
| download | emacs-e1b489df7af8f7034f8c2ef275b786e93a39df31.tar.gz emacs-e1b489df7af8f7034f8c2ef275b786e93a39df31.zip | |
Merge from trunk; up to 2012-12-09T01:04:43Z!rgm@gnu.org.
Diffstat (limited to 'src/gmalloc.c')
| -rw-r--r-- | src/gmalloc.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c index dc584955661..c325ca79910 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c | |||
| @@ -1645,14 +1645,6 @@ memalign (size_t alignment, size_t size) | |||
| 1645 | return result; | 1645 | return result; |
| 1646 | } | 1646 | } |
| 1647 | 1647 | ||
| 1648 | #ifndef ENOMEM | ||
| 1649 | #define ENOMEM 12 | ||
| 1650 | #endif | ||
| 1651 | |||
| 1652 | #ifndef EINVAL | ||
| 1653 | #define EINVAL 22 | ||
| 1654 | #endif | ||
| 1655 | |||
| 1656 | int | 1648 | int |
| 1657 | posix_memalign (void **memptr, size_t alignment, size_t size) | 1649 | posix_memalign (void **memptr, size_t alignment, size_t size) |
| 1658 | { | 1650 | { |