diff options
| author | jbj <devnull@localhost> | 2001-05-13 20:03:09 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2001-05-13 20:03:09 +0000 |
| commit | a9184b73ecb9bcb5dedb503529a0696cdb5b008a (patch) | |
| tree | 70e1bda1e22569553edaa5a685c8ff75dc85e926 /db/os | |
| parent | 2af040895b279eca8fb5a44240da7e42c8b4ac66 (diff) | |
| download | librpm-tizen-a9184b73ecb9bcb5dedb503529a0696cdb5b008a.tar.gz librpm-tizen-a9184b73ecb9bcb5dedb503529a0696cdb5b008a.tar.bz2 librpm-tizen-a9184b73ecb9bcb5dedb503529a0696cdb5b008a.zip | |
Resolve conflicts.
CVS patchset: 4783
CVS date: 2001/05/13 20:03:09
Diffstat (limited to 'db/os')
| -rw-r--r-- | db/os/os_map.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/db/os/os_map.c b/db/os/os_map.c index 590ebc501..e8eb89135 100644 --- a/db/os/os_map.c +++ b/db/os/os_map.c @@ -1,14 +1,14 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 1997, 1998, 1999, 2000 + * Copyright (c) 1996-2001 * Sleepycat Software. All rights reserved. */ #include "db_config.h" #ifndef lint -static const char revid[] = "$Id: os_map.c,v 11.32 2000/11/30 00:58:42 ubell Exp $"; +static const char revid[] = "Id: os_map.c,v 11.34 2001/04/10 20:44:34 bostic Exp "; #endif /* not lint */ #ifndef NO_SYSTEM_INCLUDES @@ -26,8 +26,6 @@ static const char revid[] = "$Id: os_map.c,v 11.32 2000/11/30 00:58:42 ubell Exp #endif #include "db_int.h" -#include "db_page.h" -#include "db_ext.h" #include "os_jump.h" #ifdef HAVE_MMAP |