ERROR macro: get rid of the many 'oddly, ERROR is not defined for c++', use PX4_ERROR

src/drivers/srf02_i2c/srf02_i2c.cpp

@@ -40,6 +40,7 @@
  */
 
 #include <px4_config.h>
+#include <px4_defines.h>
 
 #include <drivers/device/i2c.h>
 
@@ -93,13 +94,6 @@
 #define SRF02_CONVERSION_INTERVAL 	100000 /* 60ms for one sonar */
 #define TICKS_BETWEEN_SUCCESIVE_FIRES 	100000 /* 30ms between each sonar measurement (watch out for interference!) */
 
-
-/* oddly, ERROR is not defined for c++ */
-#ifdef ERROR
-# undef ERROR
-#endif
-static const int ERROR = -1;
-
 #ifndef CONFIG_SCHED_WORKQUEUE
 # error This requires CONFIG_SCHED_WORKQUEUE.
 #endif
@@ -252,7 +246,7 @@ SRF02_I2C::~SRF02_I2C()
 int
 SRF02_I2C::init()
 {
-	int ret = ERROR;
+	int ret = PX4_ERROR;
 
 	/* do I2C init (and probe) first */
 	if (I2C::init() != OK) {
@@ -732,12 +726,6 @@ SRF02_I2C::print_info()
 namespace  srf02_i2c
 {
 
-/* oddly, ERROR is not defined for c++ */
-#ifdef ERROR
-# undef ERROR
-#endif
-const int ERROR = -1;
-
 SRF02_I2C	*g_dev;
 
 void	start();