Libc-1439.100.3.tar.gz

[apple/libc.git] / include / mpool.h

diff --git a/include/mpool.h b/include/mpool.h
index e811aa334e685f67d782f66324e0ce310eeb59dd..eee16345f035df6d8a6d5c6d4eda46e55b1d4973 100644 (file)
--- a/include/mpool.h
+++ b/include/mpool.h
@@ -1,27 +1,3 @@
-/*
- * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
 /*-
  * Copyright (c) 1991, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
@@ -92,7 +68,7 @@ typedef struct MPOOL {
        pgno_t  curcache;               /* current number of cached pages */
        pgno_t  maxcache;               /* max number of cached pages */
        pgno_t  npages;                 /* number of pages in the file */
-       u_long  pagesize;               /* file page size */
+       unsigned long   pagesize;       /* file page size */
        int     fd;                     /* file descriptor */
                                        /* page in conversion routine */
        void    (*pgin)(void *, pgno_t, void *);
@@ -100,15 +76,15 @@ typedef struct MPOOL {
        void    (*pgout)(void *, pgno_t, void *);
        void    *pgcookie;              /* cookie for page in/out routines */
 #ifdef STATISTICS
-       u_long  cachehit;
-       u_long  cachemiss;
-       u_long  pagealloc;
-       u_long  pageflush;
-       u_long  pageget;
-       u_long  pagenew;
-       u_long  pageput;
-       u_long  pageread;
-       u_long  pagewrite;
+       unsigned long   cachehit;
+       unsigned long   cachemiss;
+       unsigned long   pagealloc;
+       unsigned long   pageflush;
+       unsigned long   pageget;
+       unsigned long   pagenew;
+       unsigned long   pageput;
+       unsigned long   pageread;
+       unsigned long   pagewrite;
 #endif
 } MPOOL;
 
@@ -117,8 +93,8 @@ MPOOL        *mpool_open(void *, int, pgno_t, pgno_t);
 void    mpool_filter(MPOOL *, void (*)(void *, pgno_t, void *),
            void (*)(void *, pgno_t, void *), void *);
 void   *mpool_new(MPOOL *, pgno_t *);
-void   *mpool_get(MPOOL *, pgno_t, u_int);
-int     mpool_put(MPOOL *, void *, u_int);
+void   *mpool_get(MPOOL *, pgno_t, unsigned int);
+int     mpool_put(MPOOL *, void *, unsigned int);
 int     mpool_sync(MPOOL *);
 int     mpool_close(MPOOL *);
 #ifdef STATISTICS