diff options
| author | Chris Johns <chrisj@rtems.org> | 2015-06-19 16:07:32 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2015-06-19 16:07:32 +1000 |
| commit | 59bc7c1f5f90500dbd7b419602cee84de0766e17 (patch) | |
| tree | 62bea07a0603e84b20c40376328f0045d484bc5e | |
| parent | Fix RTEMS ifdef labelling. (diff) | |
| download | rtems-libbsd-59bc7c1f5f90500dbd7b419602cee84de0766e17.tar.bz2 | |
Remove #undefs and fix formatting.
| -rw-r--r-- | rtemsbsd/include/machine/rtems-bsd-program.h | 4 | ||||
| -rw-r--r-- | rtemsbsd/rtems/rtems-bsd-program.c | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/rtemsbsd/include/machine/rtems-bsd-program.h b/rtemsbsd/include/machine/rtems-bsd-program.h index 7c2837e7..82830f51 100644 --- a/rtemsbsd/include/machine/rtems-bsd-program.h +++ b/rtemsbsd/include/machine/rtems-bsd-program.h @@ -72,22 +72,18 @@ void rtems_bsd_program_unlock(void); #ifndef RTEMS_BSD_PROGRAM_NO_EXIT_WRAP - #undef exit #define exit(code) rtems_bsd_program_exit(code) #endif #ifndef RTEMS_BSD_PROGRAM_NO_ERROR_WRAP - #undef error #define error(fmt, ...) rtems_bsd_program_error(fmt, ## __VA_ARGS__) #endif #ifndef RTEMS_BSD_PROGRAM_NO_GETPROGNAME_WRAP - #undef getprogname #define getprogname() rtems_bsd_program_get_name() #endif #ifndef RTEMS_BSD_PROGRAM_NO_PRINTF_WRAP - #undef printf #define printf(...) fprintf(stdout, __VA_ARGS__) #endif diff --git a/rtemsbsd/rtems/rtems-bsd-program.c b/rtemsbsd/rtems/rtems-bsd-program.c index 7b5920e2..18b9a627 100644 --- a/rtemsbsd/rtems/rtems-bsd-program.c +++ b/rtemsbsd/rtems/rtems-bsd-program.c @@ -52,6 +52,7 @@ #include <setjmp.h> #include <stdlib.h> +#undef printf #include <machine/rtems-bsd-program.h> struct rtems_bsd_program_control { @@ -121,12 +122,12 @@ rtems_bsd_program_exit(int exit_code) void rtems_bsd_program_error(const char *fmt, ...) { - va_list list; - va_start(list, fmt); - vfprintf(stderr, fmt, list); - fprintf(stderr, "\n"); - va_end(list); - rtems_bsd_program_exit(1); + va_list list; + va_start(list, fmt); + vfprintf(stderr, fmt, list); + fprintf(stderr, "\n"); + va_end(list); + rtems_bsd_program_exit(1); } const char * |