diff options
| author | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
| commit | d59fd3e421aa81b8e5e118f3f806081df2aca879 (patch) | |
| tree | 356a4e607edc979c625bb33db63c656d771478bd /openbsd-compat/xmmap.c | |
| parent | 7505658c58e96b8d270f1928a0e1fa7f3e0c266b (diff) | |
| parent | 45431c9b4677608680cd071768cbf156b316a7e8 (diff) | |
Merge 3.7.1p2 to the trunk. I have absolutely no idea yet whether this will
work.
Diffstat (limited to 'openbsd-compat/xmmap.c')
| -rw-r--r-- | openbsd-compat/xmmap.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/openbsd-compat/xmmap.c b/openbsd-compat/xmmap.c index 8f1d2022c..9dc4340a7 100644 --- a/openbsd-compat/xmmap.c +++ b/openbsd-compat/xmmap.c | |||
| @@ -1,4 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2002 Tim Rice. All rights reserved. | ||
| 3 | * MAP_FAILED code by Solar Designer. | ||
| 4 | * | ||
| 2 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
| 3 | * modification, are permitted provided that the following conditions | 6 | * modification, are permitted provided that the following conditions |
| 4 | * are met: | 7 | * are met: |
| @@ -20,6 +23,8 @@ | |||
| 20 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 21 | */ | 24 | */ |
| 22 | 25 | ||
| 26 | /* $Id: xmmap.c,v 1.3 2003/06/02 02:25:27 tim Exp $ */ | ||
| 27 | |||
| 23 | #include "includes.h" | 28 | #include "includes.h" |
| 24 | 29 | ||
| 25 | #ifdef HAVE_SYS_MMAN_H | 30 | #ifdef HAVE_SYS_MMAN_H |