diff options
| author | Michael Hope <michael.hope@linaro.org> | 2010-09-29 20:45:57 +1300 |
|---|---|---|
| committer | Michael Hope <michael.hope@linaro.org> | 2010-09-29 20:45:57 +1300 |
| commit | 6fcd4cd306dbecf56f5b0b506a3c23762d1219fa (patch) | |
| tree | 467125eca5a2e6706001cad8e09bc475e58a12d9 /libmaple/libmaple_types.h | |
| parent | 368e4fc1662c2594b2a0908900713a2555a3ed8e (diff) | |
| parent | adde11b099ff5dad176e410279d21feac39d2c7e (diff) | |
| download | librambutan-6fcd4cd306dbecf56f5b0b506a3c23762d1219fa.tar.gz librambutan-6fcd4cd306dbecf56f5b0b506a3c23762d1219fa.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'libmaple/libmaple_types.h')
| -rw-r--r-- | libmaple/libmaple_types.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libmaple/libmaple_types.h b/libmaple/libmaple_types.h index d49f95a..a976a9e 100644 --- a/libmaple/libmaple_types.h +++ b/libmaple/libmaple_types.h @@ -1,4 +1,4 @@ -/* ***************************************************************************** +/****************************************************************************** * The MIT License * * Copyright (c) 2010 Perry Hung. @@ -20,7 +20,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. - * ****************************************************************************/ + *****************************************************************************/ /** * @file libmaple_types.h @@ -45,5 +45,9 @@ typedef void (*voidFuncPtr)(void); #define __io volatile +#ifndef NULL +#define NULL 0 +#endif + #endif |