From 41801a5183be1798bd7da71ae05e5d6b7e7ab8e4 Mon Sep 17 00:00:00 2001 From: Anders Wallin Date: Sun, 4 Nov 2012 11:08:57 +0200 Subject: [PATCH] define NULL in places where gcc 4.7.2 wants it --- src/emc/motion/command.c | 1 + src/hal/components/at_pid.c | 1 + src/hal/components/boss_plc.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/emc/motion/command.c b/src/emc/motion/command.c index 3ee0f76..1fae0b0 100644 --- a/src/emc/motion/command.c +++ b/src/emc/motion/command.c @@ -72,6 +72,7 @@ // Mark strings for translation, but defer translation to userspace #define _(s) (s) +#define NULL 0 /* debugging functions */ extern void print_pose ( EmcPose *pos ); diff --git a/src/hal/components/at_pid.c b/src/hal/components/at_pid.c index d3e38dd..63d1eef 100644 --- a/src/hal/components/at_pid.c +++ b/src/hal/components/at_pid.c @@ -125,6 +125,7 @@ #include "rtapi_math.h" #include "hal.h" // HAL public API decls. +#define NULL 0 // Module information. MODULE_AUTHOR("Pete Vavaroutsos"); diff --git a/src/hal/components/boss_plc.c b/src/hal/components/boss_plc.c index 4b40a0e..1f8e53c 100644 --- a/src/hal/components/boss_plc.c +++ b/src/hal/components/boss_plc.c @@ -123,7 +123,7 @@ #define TRUE 1 #define FALSE 0 typedef int BOOL; - +#define NULL 0 // Module information. MODULE_AUTHOR("Pete Vavaroutsos"); -- 1.7.10.4