From 9aaae1ab2cfd40c9873ff67a2760ccf65cb8c442 Mon Sep 17 00:00:00 2001
From: richard <richard@72102866-910b-0410-8b05-ffd578937521>
Date: Thu, 18 Nov 1999 15:18:47 +0000
Subject: [PATCH] Put NSPage declarations in NSZone.h for compatibility with
 MacOS-X

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@5236 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                         |  7 +++++
 Headers/gnustep/base/Foundation.h |  1 -
 Headers/gnustep/base/NSPage.h     | 44 -------------------------------
 Headers/gnustep/base/NSZone.h     | 19 +++++++++++++
 Source/GNUmakefile                |  1 -
 Source/NSPage.m                   |  1 +
 Source/NSZone.m                   |  1 -
 7 files changed, 27 insertions(+), 47 deletions(-)
 delete mode 100644 Headers/gnustep/base/NSPage.h

diff --git a/ChangeLog b/ChangeLog
index 5e8e8c870..5345bfcf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Nov 18 15:23:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Headers/Foundation/NSPage.h: removed
+	* Headers/Foundation/NSZone.h: incorporated NSPage.h
+	* Source/GNUmakefile: Remove reference to NSPage.h
+	* Source/NSZone.m: Remove reference to NSPage.h
+
 Sun Nov  7 14:04:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Source/o_vscanf.c Reverted to earlier version - the last fix was
diff --git a/Headers/gnustep/base/Foundation.h b/Headers/gnustep/base/Foundation.h
index bedbfb9f4..735ad5325 100644
--- a/Headers/gnustep/base/Foundation.h
+++ b/Headers/gnustep/base/Foundation.h
@@ -61,7 +61,6 @@
 #include <Foundation/NSMethodSignature.h>
 #include <Foundation/NSNotification.h>
 #include <Foundation/NSNotificationQueue.h>
-#include <Foundation/NSPage.h>
 #include <Foundation/NSPathUtilities.h>
 #include <Foundation/NSPortCoder.h>
 #include <Foundation/NSPortMessage.h>
diff --git a/Headers/gnustep/base/NSPage.h b/Headers/gnustep/base/NSPage.h
deleted file mode 100644
index 6115299a8..000000000
--- a/Headers/gnustep/base/NSPage.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Page memory management. -*- Mode: ObjC -*-
-   Copyright (C) 1996 Free Software Foundation, Inc.
-
-   Written by: Yoo C. Chung <wacko@laplace.snu.ac.kr>
-   Date: November 1996
-
-   This file is part of the GNUstep Base Library.
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
-
-#ifndef __NSPage_h_GNUSTEP_BASE_INCLUDE
-#define __NSPage_h_GNUSTEP_BASE_INCLUDE
-
-extern unsigned NSPageSize (void) __attribute__ ((const));
-
-extern unsigned NSLogPageSize (void) __attribute__ ((const));
-
-extern unsigned NSRoundDownToMultipleOfPageSize (unsigned bytes)
-  __attribute__ ((const));
-
-extern unsigned NSRoundUpToMultipleOfPageSize (unsigned bytes)
-  __attribute__ ((const));
-
-extern unsigned NSRealMemoryAvailable (void);
-
-extern void* NSAllocateMemoryPages (unsigned bytes);
-
-extern void NSDeallocateMemoryPages (void *ptr, unsigned bytes);
-
-extern void NSCopyMemoryPages (const void *src, void *dest, unsigned bytes);
-
-#endif /* not __NSPage_h_GNUSTEP_BASE_INCLUDE */
diff --git a/Headers/gnustep/base/NSZone.h b/Headers/gnustep/base/NSZone.h
index 0d4e7a85c..723a8e521 100644
--- a/Headers/gnustep/base/NSZone.h
+++ b/Headers/gnustep/base/NSZone.h
@@ -238,4 +238,23 @@ extern inline struct NSZoneStats NSZoneStats (NSZone *zone)
 
 #endif	/* GS_WITH_GC */
 
+
+extern unsigned NSPageSize (void) __attribute__ ((const));
+
+extern unsigned NSLogPageSize (void) __attribute__ ((const));
+
+extern unsigned NSRoundDownToMultipleOfPageSize (unsigned bytes)
+  __attribute__ ((const));
+
+extern unsigned NSRoundUpToMultipleOfPageSize (unsigned bytes)
+  __attribute__ ((const));
+
+extern unsigned NSRealMemoryAvailable (void);
+
+extern void* NSAllocateMemoryPages (unsigned bytes);
+
+extern void NSDeallocateMemoryPages (void *ptr, unsigned bytes);
+
+extern void NSCopyMemoryPages (const void *src, void *dest, unsigned bytes);
+
 #endif /* not __NSZone_h_GNUSTEP_BASE_INCLUDE */
diff --git a/Source/GNUmakefile b/Source/GNUmakefile
index 2cbdcd843..d0721687c 100644
--- a/Source/GNUmakefile
+++ b/Source/GNUmakefile
@@ -407,7 +407,6 @@ Foundation/NSNotification.h \
 Foundation/NSNotificationQueue.h \
 Foundation/NSObjCRuntime.h \
 Foundation/NSObject.h \
-Foundation/NSPage.h \
 Foundation/NSPathUtilities.h \
 Foundation/NSPort.h \
 Foundation/NSPortCoder.h \
diff --git a/Source/NSPage.m b/Source/NSPage.m
index fc46269ec..208f32a41 100644
--- a/Source/NSPage.m
+++ b/Source/NSPage.m
@@ -23,6 +23,7 @@
 
 #include <config.h>
 #include <base/preface.h>
+#include <Foundation/NSZone.h>
 #include <string.h>
 #ifndef __WIN32__
 #include <unistd.h>
diff --git a/Source/NSZone.m b/Source/NSZone.m
index e9aac3a28..bd37adb65 100644
--- a/Source/NSZone.m
+++ b/Source/NSZone.m
@@ -86,7 +86,6 @@
 #include <string.h>
 #include <objc/objc-api.h>
 #include <Foundation/NSException.h>
-#include <Foundation/NSPage.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSZone.h>
 #include <Foundation/NSLock.h>