summaryrefslogtreecommitdiff
path: root/nuttx/include
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-04-07 14:08:37 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-04-07 14:08:37 +0000
commitd4f815f5cd39cc0c1730f2e3131540b99ea0d921 (patch)
tree0757b55e583be618fe5eae3079126af82845d33d /nuttx/include
parent5c29bff3aecd7f807c5e5e4bcc7b86a99cad44db (diff)
downloadpx4-nuttx-d4f815f5cd39cc0c1730f2e3131540b99ea0d921.tar.gz
px4-nuttx-d4f815f5cd39cc0c1730f2e3131540b99ea0d921.tar.bz2
px4-nuttx-d4f815f5cd39cc0c1730f2e3131540b99ea0d921.zip
Move include/math.h to include/nuttx/math.h
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4568 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/include')
-rw-r--r--nuttx/include/nuttx/math.h (renamed from nuttx/include/math.h)33
1 files changed, 13 insertions, 20 deletions
diff --git a/nuttx/include/math.h b/nuttx/include/nuttx/math.h
index c14220146..e44497241 100644
--- a/nuttx/include/math.h
+++ b/nuttx/include/nuttx/math.h
@@ -1,8 +1,8 @@
/****************************************************************************
- * include/math.h
+ * include/nuttx/math.h
*
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef __INCLUDE_MATH_H
-#define __INCLUDE_MATH_H
+#ifndef __INCLUDE_NUTTX_MATH_H
+#define __INCLUDE_NUTTX_MATH_H
/****************************************************************************
* Included Files
@@ -42,9 +42,15 @@
#include <nuttx/config.h>
+/* If CONFIG_ARCH_MATH_H is defined, then the top-level Makefile will copy
+ * this header file to include/math.h where it will become the system math.h
+ * header file. In this case, the architecture specific code must provide
+ * an arch/<cpy>/include/math.h file which will be included below:
+ */
+
#ifdef CONFIG_ARCH_MATH_H
# include <arch/math.h>
-#else
+#endif
/****************************************************************************
* Type Definitions
@@ -54,17 +60,4 @@
* Public Function Prototypes
****************************************************************************/
-#ifdef __cplusplus
-#define EXTERN extern "C"
-extern "C" {
-#else
-#define EXTERN extern
-#endif
-
-#undef EXTERN
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CONFIG_ARCH_MATH_H */
-#endif /* __INCLUDE_MATH_H */
+#endif /* __INCLUDE_NUTTX_MATH_H */