- Merge aicom-network-branch (still without the NDIS stuff)

[reactos.git] / reactos / lib / drivers / oskittcp / include / freebsd / src / sys / sys / malloc.h

diff --git a/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/malloc.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/malloc.h
index ae4a946..bde211c 100644 (file)
--- a/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/malloc.h
+++ b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/malloc.h
@@ -36,7 +36,7 @@
 #ifndef _SYS_MALLOC_H_
 #define        _SYS_MALLOC_H_
 
 #ifndef _SYS_MALLOC_H_
 #define        _SYS_MALLOC_H_
 

-#ifndef OSKIT
+#if !defined(OSKIT) || defined(__REACTOS__)

 #define KMEMSTATS
 #endif
 
 #define KMEMSTATS
 #endif
 


@@ -288,7 +288,6 @@ struct kmembuckets {
 #define        MALLOC(space, cast, size, type, flags) \
        (space) = (cast)fbsd_malloc((u_long)(size), __FILE__, __LINE__, type, flags)
 #define FREE(addr, type) fbsd_free((caddr_t)(addr), __FILE__, __LINE__, type)
 #define        MALLOC(space, cast, size, type, flags) \
        (space) = (cast)fbsd_malloc((u_long)(size), __FILE__, __LINE__, type, flags)
 #define FREE(addr, type) fbsd_free((caddr_t)(addr), __FILE__, __LINE__, type)

-

 #else /* do not collect statistics */
 #define        MALLOC(space, cast, size, type, flags) { \
        register struct kmembuckets *kbp = &bucket[BUCKETINDX(size)]; \
 #else /* do not collect statistics */
 #define        MALLOC(space, cast, size, type, flags) { \
        register struct kmembuckets *kbp = &bucket[BUCKETINDX(size)]; \