diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-29 14:47:22 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-29 14:47:22 -0600 |
| commit | 64892e44f2ce2612c77b1b20497fb007adafafb8 (patch) | |
| tree | 2c917f29727a017b85193ac85959663d504b26e5 /nuttx/libxx/libxx_internal.hxx | |
| parent | c48af0eb9c61462f59a7ba63ca7a73e8df146f49 (diff) | |
| download | nuttx-64892e44f2ce2612c77b1b20497fb007adafafb8.tar.gz nuttx-64892e44f2ce2612c77b1b20497fb007adafafb8.tar.bz2 nuttx-64892e44f2ce2612c77b1b20497fb007adafafb8.zip | |
Rename CONFIG_NUTTX_KERNEL to CONFIG_BUILD_PROTECTED; Partially integrate new CONFIG_BUILD_KERNEL
Diffstat (limited to 'nuttx/libxx/libxx_internal.hxx')
| -rw-r--r-- | nuttx/libxx/libxx_internal.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nuttx/libxx/libxx_internal.hxx b/nuttx/libxx/libxx_internal.hxx index 74d5526ce..25ad13c76 100644 --- a/nuttx/libxx/libxx_internal.hxx +++ b/nuttx/libxx/libxx_internal.hxx @@ -52,7 +52,8 @@ // built as separated kernel- and user-space modules, then only the first // mode is supported. -#if defined(CONFIG_NUTTX_KERNEL) && defined(__KERNEL__) +#if (defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \ + defined(CONFIG_BUILD_KERNEL) # include <nuttx/kmalloc.h> # define lib_malloc(s) kmalloc(s) # define lib_zalloc(s) kzalloc(s) |