]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - keystone-rtos/starterware.git/commitdiff
starterware: PRSDK-3529: fix "E_FAIL" redefined error
authorHao Zhang <hzhang@ti.com>
Mon, 5 Feb 2018 12:23:32 +0000 (07:23 -0500)
committerHao Zhang <hzhang@ti.com>
Mon, 5 Feb 2018 12:23:32 +0000 (07:23 -0500)
"E_FAIL" is defined in UART_stdio.h API header, it should use #ifndef
to avoid re-definition.

Signed-off-by: Hao Zhang <hzhang@ti.com>
include/error.h

index b71db8e94f6a47c474c6beef1bdfbd484c65b65e..010d60414ee49bd44e8df104c2fd7df197f62f20 100644 (file)
@@ -80,9 +80,13 @@ extern "C" {
 /** @{ */
 
 /** \brief Successful completion of the functionality.  */
+#ifndef S_PASS
 #define S_PASS                  (0)
+#endif
+#ifndef E_FAIL
 /** \brief Generic failure code.                        */
-#define E_FAIL                  (-1)
+#define E_FAIL                  (-((int32_t)1))
+#endif
 /** \brief Invalid parameter                            */
 #define E_INVALID_PARAM         (-2)
 /** \brief Invalid operation                            */