[Cvs-cvs] ccvs/src ChangeLog rcs.c

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/09/12 19:45:14

Modified files:
        src            : ChangeLog rcs.c 

Log message:
        * rcs.c: Move mmap cruft into a library header.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3574&r2=1.3575
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/rcs.c?cvsroot=cvs&r1=1.391&r2=1.392

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3574
retrieving revision 1.3575
diff -u -b -r1.3574 -r1.3575
--- ChangeLog   12 Sep 2008 15:43:11 -0000      1.3574
+++ ChangeLog   12 Sep 2008 19:45:09 -0000      1.3575
@@ -1,5 +1,7 @@
 2008-09-12  Derek R. Price  <address@hidden>
 
+       * rcs.c: Move mmap cruft into a library header.
+
        [bug #17565] (Patch from Susanne Bertling <address@hidden>).
        * classify.c (Classify_File): Check for conflicts before keywords.
        * sanity.sh (branches-15): Update to compensate.

Index: rcs.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/rcs.c,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -b -r1.391 -r1.392
--- rcs.c       17 Dec 2007 04:57:33 -0000      1.391
+++ rcs.c       12 Sep 2008 19:45:14 -0000      1.392
@@ -29,26 +29,14 @@
 #include "edit.h"
 #include "gpg.h"
 #include "hardlink.h"
+#ifdef HAVE_MMAP
+# include "mman.h"
+#endif
 #include "repos.h"
 #include "sign.h"
 
 #include "cvs.h"
 
-/* These need to be source after cvs.h or HAVE_MMAP won't be set... */
-#ifdef HAVE_MMAP
-# include "getpagesize.h"
-# include <sys/mman.h>
-
-/* Define MAP_FILE when it isn't otherwise.  */
-# ifndef MAP_FILE
-#  define MAP_FILE 0
-# endif
-/* Define MAP_FAILED for old systems which neglect to.  */
-# ifndef MAP_FAILED
-#  define MAP_FAILED ((void *)-1)
-# endif
-#endif
-
 #ifdef MMAP_FALLBACK_TEST
 void *my_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t 
offset)
 {