diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-02-12 14:37:55 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-02-12 14:37:55 +0000 |
| commit | b769f6a93e42f6052d27f85dd38ea594361ce170 (patch) | |
| tree | 30a0eaa4bcc50079c8545227554a9d47c336d8fe /nuttx/include | |
| parent | 84eb7fe1709023514ee0a1c85af34cda2a37bd07 (diff) | |
| download | px4-nuttx-b769f6a93e42f6052d27f85dd38ea594361ce170.tar.gz px4-nuttx-b769f6a93e42f6052d27f85dd38ea594361ce170.tar.bz2 px4-nuttx-b769f6a93e42f6052d27f85dd38ea594361ce170.zip | |
More z8 compilation changes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@671 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/assert.h | 5 | ||||
| -rw-r--r-- | nuttx/include/nuttx/arch.h | 10 | ||||
| -rw-r--r-- | nuttx/include/nuttx/compiler.h | 4 |
3 files changed, 7 insertions, 12 deletions
diff --git a/nuttx/include/assert.h b/nuttx/include/assert.h index 5f69b7178..62c8baa25 100644 --- a/nuttx/include/assert.h +++ b/nuttx/include/assert.h @@ -41,6 +41,7 @@ ************************************************************/ #include <sys/types.h> +#include <nuttx/compiler.h> /************************************************************ * Definitions @@ -53,7 +54,7 @@ #undef ASSERTCODE #undef DEBUGASSERT -#if defined(__GNUC__) || defined(SDCC) +#ifdef CONFIG_HAVE_FILENAME # define ASSERT(f) \ { if (!(f)) up_assert((const ubyte *)__FILE__, (int)__LINE__); } @@ -105,7 +106,7 @@ extern "C" { #define EXTERN extern #endif -#if defined(__GNUC__) || defined(SDCC) +#ifdef CONFIG_HAVE_FILENAME EXTERN void up_assert(const ubyte *filename, int linenum); EXTERN void up_assert_code(const ubyte *filename, int linenum, int error_code); diff --git a/nuttx/include/nuttx/arch.h b/nuttx/include/nuttx/arch.h index 2c83f1f2a..7f054e088 100644 --- a/nuttx/include/nuttx/arch.h +++ b/nuttx/include/nuttx/arch.h @@ -376,16 +376,6 @@ EXTERN void up_allocate_heap(FAR void **heap_start, size_t *heap_size); EXTERN boolean up_interrupt_context(void); /**************************************************************************** - * Name: up_disable_irq - * - * Description: - * Disable the IRQ specified by 'irq' - * - ****************************************************************************/ - -EXTERN void up_disable_irq(int irq); - -/**************************************************************************** * Name: up_enable_irq * * Description: diff --git a/nuttx/include/nuttx/compiler.h b/nuttx/include/nuttx/compiler.h index d14f816c0..f0235ed1d 100644 --- a/nuttx/include/nuttx/compiler.h +++ b/nuttx/include/nuttx/compiler.h @@ -56,6 +56,7 @@ /* Intriniscs */ # define CONFIG_HAVE_FUNCTIONNAME 1 /* Has __FUNCTION__ */ +# define CONFIG_HAVE_FILENAME 1 /* Has __FILE__ */ /* Attributes * @@ -135,6 +136,7 @@ /* Intriniscs */ # define CONFIG_HAVE_FUNCTIONNAME 1 /* Has __FUNCTION__ */ +# define CONFIG_HAVE_FILENAME 1 /* Has __FILE__ */ /* Pragmas * @@ -240,6 +242,7 @@ /* Intriniscs */ # define CONFIG_HAVE_FUNCTIONNAME 1 /* Has __FUNCTION__ */ +# define CONFIG_HAVE_FILENAME 1 /* Has __FILE__ */ /* Attributes * @@ -313,6 +316,7 @@ # undef CONFIG_CPP_HAVE_VARARGS # undef CONFIG_CPP_HAVE_WARNING # undef CONFIG_HAVE_FUNCTIONNAME +# undef CONFIG_HAVE_FILENAME # undef CONFIG_HAVE_WEAKFUNCTIONS # define weak_alias(name, aliasname) # define weak_function |