Mercurial > ecos

changeset 263:c0d53837cb68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow configurations which have the kernel but not the memalloc package.
author bartv
date Mon, 05 Aug 2002 21:52:58 +0000
parents 3d3a7f481015
children 57f3c72256bb
files packages/kernel/current/ChangeLog packages/kernel/current/cdl/kernel.cdl packages/kernel/current/include/kapi.h packages/kernel/current/include/kapidata.h
diffstat 4 files changed, 15 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/packages/kernel/current/ChangeLog
+++ b/packages/kernel/current/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-05  Bart Veer  <bartv@tymora.demon.co.uk>
+
+	* cdl/kernel.cdl, include/kapidata.h, include/kapi.h:
+	Allow configurations with the kernel but no malloc
+
 2002-06-05  Gary Thomas  <gary@chez-thomas.org>
 
 	* include/kapi.h: Fix prototype (to allow builds with net stack).
--- a/packages/kernel/current/cdl/kernel.cdl
+++ b/packages/kernel/current/cdl/kernel.cdl
@@ -258,8 +258,6 @@ cdl_package CYGPKG_KERNEL {
         cdl_option CYGFUN_KERNEL_API_C {
             display       "Provide C API"
             default_value 1
-            requires      CYGPKG_MEMALLOC
-            requires      CYGFUN_MEMALLOC_KAPI
             description   "
                 The eCos kernel is implemented in C++, but there is an
                 optional C API for use by application code. This C API can be
--- a/packages/kernel/current/include/kapi.h
+++ b/packages/kernel/current/include/kapi.h
@@ -11,6 +11,7 @@
 //####ECOSGPLCOPYRIGHTBEGIN####
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 2002 Bart Veer
 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
 //
 // eCos is free software; you can redistribute it and/or modify it under
@@ -56,6 +57,7 @@
 //
 //========================================================================*/
 
+#include <pkgconf/system.h>
 #include <pkgconf/kernel.h>
 
 #ifdef CYGFUN_KERNEL_API_C
@@ -479,7 +481,9 @@ cyg_bool_t cyg_mbox_waiting_to_put(cyg_h
 /* These definitions are found in the "memalloc" package as this is      */
 /* where the implementation lives.                                       */
 
-#include <cyg/memalloc/kapi.h>
+#ifdef CYGPKG_MEMALLOC
+# include <cyg/memalloc/kapi.h>
+#endif
 
 /*---------------------------------------------------------------------------*/
 /* Semaphores                                                                */
--- a/packages/kernel/current/include/kapidata.h
+++ b/packages/kernel/current/include/kapidata.h
@@ -11,6 +11,7 @@
 //####ECOSGPLCOPYRIGHTBEGIN####
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 2002 Bart Veer
 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
 //
 // eCos is free software; you can redistribute it and/or modify it under
@@ -60,6 +61,7 @@
 //
 //==========================================================================*/
 
+#include <pkgconf/system.h>
 #include <pkgconf/kernel.h>
 
 #include <cyg/infra/cyg_type.h>
@@ -511,7 +513,9 @@ struct cyg_spinlock_t
 /* Memory allocator types now come from the "memalloc" package which is   */
 /* where the implementation lives.                                        */
 
-#include <cyg/memalloc/kapidata.h>
+#ifdef CYGPKG_MEMALLOC
+# include <cyg/memalloc/kapidata.h>
+#endif
 
 #ifdef __cplusplus
 }