diff options
| author | Andreas Rottmann <a.rottmann@gmx.at> | 2010-05-27 18:23:17 +0200 |
|---|---|---|
| committer | Andreas Rottmann <a.rottmann@gmx.at> | 2010-05-27 18:23:17 +0200 |
| commit | bd6adfa17d453e4c486e36fed4c5779db90a8a0e (patch) | |
| tree | 9798677560d5f99061afe9f0db105a8c97f2438a /tests/zerosize-ptr.h | |
| parent | 79ca645d222db2e158784642c3b464a47bea26f3 (diff) | |
| parent | 3e0814cd9862b89c7a39672672937477bd87ddfb (diff) | |
Merge commit 'upstream/0.9.3'
Diffstat (limited to 'tests/zerosize-ptr.h')
| -rw-r--r-- | tests/zerosize-ptr.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/zerosize-ptr.h b/tests/zerosize-ptr.h index a38a2cf..cfab200 100644 --- a/tests/zerosize-ptr.h +++ b/tests/zerosize-ptr.h @@ -1,5 +1,5 @@ /* Return a pointer to a zero-size object in memory. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -57,11 +57,11 @@ zerosize_ptr (void) { int pagesize = getpagesize (); char *two_pages = - (char *) mmap (NULL, 2 * pagesize, PROT_READ | PROT_WRITE, - flags, fd, 0); + (char *) mmap (NULL, 2 * pagesize, PROT_READ | PROT_WRITE, + flags, fd, 0); if (two_pages != (char *)(-1) - && mprotect (two_pages + pagesize, pagesize, PROT_NONE) == 0) - return two_pages + pagesize; + && mprotect (two_pages + pagesize, pagesize, PROT_NONE) == 0) + return two_pages + pagesize; } #endif return NULL; |