From 2936b425fd89f68302a0cb6094c8370795668872 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 23 Jan 1998 17:45:05 +0000 Subject: Solaris port updates from Chris Johns --- Makefile.in | 2 ++ c/build-tools/eolstrip.c | 2 +- c/build-tools/packhex.c | 2 +- c/build-tools/src/eolstrip.c | 2 +- c/build-tools/src/packhex.c | 2 +- c/src/exec/libcsupport/src/__gettod.c | 2 +- c/src/exec/libcsupport/src/error.c | 12 +++++++----- c/src/exec/score/cpu/unix/cpu.c | 10 ---------- c/src/exec/wrapup/rtems/Makefile.in | 2 +- c/src/lib/include/rtems++/rtemsInterrupt.h | 2 +- c/src/lib/libbsp/unix/posix/timer/timer.c | 3 --- c/src/lib/libc/__gettod.c | 2 +- c/src/lib/libc/error.c | 12 +++++++----- c/src/lib/libmisc/error/error.c | 12 +++++++----- c/src/lib/libmisc/monitor/mon-symbols.c | 12 ++++++------ c/src/lib/librtems++/rtemsMessageQueue.cc | 1 + c/src/lib/librtems++/rtemsSemaphore.cc | 1 + c/src/lib/librtems++/rtemsTask.cc | 1 + c/src/lib/librtems++/rtemsTimer.cc | 1 + c/src/libmisc/error/error.c | 12 +++++++----- c/src/libmisc/monitor/mon-symbols.c | 12 ++++++------ c/src/librtems++/include/rtems++/rtemsInterrupt.h | 2 +- c/src/librtems++/src/rtemsMessageQueue.cc | 1 + c/src/librtems++/src/rtemsSemaphore.cc | 1 + c/src/librtems++/src/rtemsTask.cc | 1 + c/src/librtems++/src/rtemsTimer.cc | 1 + c/src/make/directory.cfg | 11 ++++++++++- c/src/tests/samples/cdtest/main.cc | 1 + c/src/tests/samples/paranoia/paranoia.c | 4 ++++ cpukit/libcsupport/src/__gettod.c | 2 +- cpukit/libcsupport/src/error.c | 12 +++++++----- cpukit/libmisc/monitor/mon-symbols.c | 12 ++++++------ cpukit/score/cpu/unix/cpu.c | 10 ---------- make/custom/Solaris-posix.cfg | 12 +++++++++++- make/directory.cfg | 11 ++++++++++- testsuites/samples/cdtest/main.cc | 1 + testsuites/samples/paranoia/paranoia.c | 4 ++++ tools/build/eolstrip.c | 2 +- tools/build/packhex.c | 2 +- tools/build/src/eolstrip.c | 2 +- tools/build/src/packhex.c | 2 +- 41 files changed, 118 insertions(+), 83 deletions(-) diff --git a/Makefile.in b/Makefile.in index d62c466b1d..c7958fb0d1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,6 +18,8 @@ manext = 1 mandir = @mandir@/man$(manext) program_prefix = @program_prefix@ +export bindir + RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ diff --git a/c/build-tools/eolstrip.c b/c/build-tools/eolstrip.c index d15151c8b0..467b352322 100644 --- a/c/build-tools/eolstrip.c +++ b/c/build-tools/eolstrip.c @@ -197,7 +197,7 @@ process(char *arg) if ( buffer[ length ] != '\n' ) error(ERR_ERRNO|ERR_FATAL, "Line %d too long in %s\n", line_number, arg); - while ( isspace( buffer[ length ] ) ) + while ( isspace( (int) buffer[ length ] ) ) buffer[ length-- ] = '\0'; if ( test_only ) { diff --git a/c/build-tools/packhex.c b/c/build-tools/packhex.c index aa92761a91..9d19ce39e1 100644 --- a/c/build-tools/packhex.c +++ b/c/build-tools/packhex.c @@ -478,7 +478,7 @@ int main( } while ( gets( inbuff ) != NULL ); - exit( EXIT_SUCCESS ); + return ( EXIT_SUCCESS ); } diff --git a/c/build-tools/src/eolstrip.c b/c/build-tools/src/eolstrip.c index d15151c8b0..467b352322 100644 --- a/c/build-tools/src/eolstrip.c +++ b/c/build-tools/src/eolstrip.c @@ -197,7 +197,7 @@ process(char *arg) if ( buffer[ length ] != '\n' ) error(ERR_ERRNO|ERR_FATAL, "Line %d too long in %s\n", line_number, arg); - while ( isspace( buffer[ length ] ) ) + while ( isspace( (int) buffer[ length ] ) ) buffer[ length-- ] = '\0'; if ( test_only ) { diff --git a/c/build-tools/src/packhex.c b/c/build-tools/src/packhex.c index aa92761a91..9d19ce39e1 100644 --- a/c/build-tools/src/packhex.c +++ b/c/build-tools/src/packhex.c @@ -478,7 +478,7 @@ int main( } while ( gets( inbuff ) != NULL ); - exit( EXIT_SUCCESS ); + return ( EXIT_SUCCESS ); } diff --git a/c/src/exec/libcsupport/src/__gettod.c b/c/src/exec/libcsupport/src/__gettod.c index b3f091a1b3..cbec1455be 100644 --- a/c/src/exec/libcsupport/src/__gettod.c +++ b/c/src/exec/libcsupport/src/__gettod.c @@ -20,8 +20,8 @@ #include #endif -#include #include +#include #include #include diff --git a/c/src/exec/libcsupport/src/error.c b/c/src/exec/libcsupport/src/error.c index 5bd481c3e6..ab4693609e 100644 --- a/c/src/exec/libcsupport/src/error.c +++ b/c/src/exec/libcsupport/src/error.c @@ -142,11 +142,13 @@ static int rtems_verror( chars_written += fprintf(stderr, " (status: %s)", rtems_status_text(status)); if (local_errno) - if ((local_errno > 0) && *strerror(local_errno)) - chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno)); - else - chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno); - + { + if ((local_errno > 0) && *strerror(local_errno)) + chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno)); + else + chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno); + } + chars_written += fprintf(stderr, "\n"); (void) fflush(stderr); diff --git a/c/src/exec/score/cpu/unix/cpu.c b/c/src/exec/score/cpu/unix/cpu.c index 6fe63f844f..219b81f685 100644 --- a/c/src/exec/score/cpu/unix/cpu.c +++ b/c/src/exec/score/cpu/unix/cpu.c @@ -14,16 +14,6 @@ #include #include -#if defined(solaris2) -/* -#undef _POSIX_C_SOURCE -#define _POSIX_C_SOURCE 3 -#undef __STRICT_ANSI__ -#define __STRICT_ANSI__ -*/ -#define __EXTENSIONS__ -#endif - #if defined(__linux__) #define MALLOC_0_RETURNS_NULL #endif diff --git a/c/src/exec/wrapup/rtems/Makefile.in b/c/src/exec/wrapup/rtems/Makefile.in index a00c043c8a..064652c1db 100644 --- a/c/src/exec/wrapup/rtems/Makefile.in +++ b/c/src/exec/wrapup/rtems/Makefile.in @@ -45,7 +45,7 @@ CLOBBER_ADDITIONS += $(LIB): ${OBJS} $(make-library) - cd $(PROJECT_ROOT) ; \ + -cd $(PROJECT_ROOT) ; \ $(PROJECT_RELEASE)/bin/size_rtems $(RTEMS_BSP) \ >$(PROJECT_RELEASE)/lib/sizeinfo.txt diff --git a/c/src/lib/include/rtems++/rtemsInterrupt.h b/c/src/lib/include/rtems++/rtemsInterrupt.h index 0dc6a20d5e..f722eb7683 100644 --- a/c/src/lib/include/rtems++/rtemsInterrupt.h +++ b/c/src/lib/include/rtems++/rtemsInterrupt.h @@ -71,7 +71,7 @@ protected: private: const rtemsInterrupt& operator=(const rtemsInterrupt& ); - Interrupt(const rtemsInterrupt& ); + rtemsInterrupt(const rtemsInterrupt& ); // the vector caught rtems_vector_number vector; diff --git a/c/src/lib/libbsp/unix/posix/timer/timer.c b/c/src/lib/libbsp/unix/posix/timer/timer.c index 6056ddaef8..dca88174b0 100644 --- a/c/src/lib/libbsp/unix/posix/timer/timer.c +++ b/c/src/lib/libbsp/unix/posix/timer/timer.c @@ -16,9 +16,6 @@ * $Id$ */ -/* For solaris 2.4 */ -#define __EXTENSIONS__ - #include #include #include diff --git a/c/src/lib/libc/__gettod.c b/c/src/lib/libc/__gettod.c index b3f091a1b3..cbec1455be 100644 --- a/c/src/lib/libc/__gettod.c +++ b/c/src/lib/libc/__gettod.c @@ -20,8 +20,8 @@ #include #endif -#include #include +#include #include #include diff --git a/c/src/lib/libc/error.c b/c/src/lib/libc/error.c index 5bd481c3e6..ab4693609e 100644 --- a/c/src/lib/libc/error.c +++ b/c/src/lib/libc/error.c @@ -142,11 +142,13 @@ static int rtems_verror( chars_written += fprintf(stderr, " (status: %s)", rtems_status_text(status)); if (local_errno) - if ((local_errno > 0) && *strerror(local_errno)) - chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno)); - else - chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno); - + { + if ((local_errno > 0) && *strerror(local_errno)) + chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno)); + else + chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno); + } + chars_written += fprintf(stderr, "\n"); (void) fflush(stderr); diff --git a/c/src/lib/libmisc/error/error.c b/c/src/lib/libmisc/error/error.c index 5bd481c3e6..ab4693609e 100644 --- a/c/src/lib/libmisc/error/error.c +++ b/c/src/lib/libmisc/error/error.c @@ -142,11 +142,13 @@ static int rtems_verror( chars_written += fprintf(stderr, " (status: %s)", rtems_status_text(status)); if (local_errno) - if ((local_errno > 0) && *strerror(local_errno)) - chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno)); - else - chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno); - + { + if ((local_errno > 0) && *strerror(local_errno)) + chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno)); + else + chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno); + } + chars_written += fprintf(stderr, "\n"); (void) fflush(stderr); diff --git a/c/src/lib/libmisc/monitor/mon-symbols.c b/c/src/lib/libmisc/monitor/mon-symbols.c index 64a05dee9b..1fed3c47f7 100644 --- a/c/src/lib/libmisc/monitor/mon-symbols.c +++ b/c/src/lib/libmisc/monitor/mon-symbols.c @@ -11,17 +11,17 @@ * $Id$ */ -#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ -#include -#include -#include - -/* for strcasecmp in linux */ +/* for strcasecmp in linux and solaris */ #if defined(linux) #define __USE_BSD #endif #include +#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ +#include +#include +#include + #include #include diff --git a/c/src/lib/librtems++/rtemsMessageQueue.cc b/c/src/lib/librtems++/rtemsMessageQueue.cc index 1978e1c6ec..c3183dc2b0 100644 --- a/c/src/lib/librtems++/rtemsMessageQueue.cc +++ b/c/src/lib/librtems++/rtemsMessageQueue.cc @@ -18,6 +18,7 @@ ------------------------------------------------------------------------ */ +#include #include /* ---- diff --git a/c/src/lib/librtems++/rtemsSemaphore.cc b/c/src/lib/librtems++/rtemsSemaphore.cc index 1e0d3de472..5821612618 100644 --- a/c/src/lib/librtems++/rtemsSemaphore.cc +++ b/c/src/lib/librtems++/rtemsSemaphore.cc @@ -18,6 +18,7 @@ ------------------------------------------------------------------------ */ +#include #include /* ---- diff --git a/c/src/lib/librtems++/rtemsTask.cc b/c/src/lib/librtems++/rtemsTask.cc index d90c8f669f..619f7d4071 100644 --- a/c/src/lib/librtems++/rtemsTask.cc +++ b/c/src/lib/librtems++/rtemsTask.cc @@ -18,6 +18,7 @@ ------------------------------------------------------------------------ */ +#include #include // include to allow it to be compiled #include diff --git a/c/src/lib/librtems++/rtemsTimer.cc b/c/src/lib/librtems++/rtemsTimer.cc index b87ffd5e80..835bfd74ce 100644 --- a/c/src/lib/librtems++/rtemsTimer.cc +++ b/c/src/lib/librtems++/rtemsTimer.cc @@ -18,6 +18,7 @@ ------------------------------------------------------------------------ */ +#include #include /* ---- diff --git a/c/src/libmisc/error/error.c b/c/src/libmisc/error/error.c index 5bd481c3e6..ab4693609e 100644 --- a/c/src/libmisc/error/error.c +++ b/c/src/libmisc/error/error.c @@ -142,11 +142,13 @@ static int rtems_verror( chars_written += fprintf(stderr, " (status: %s)", rtems_status_text(status)); if (local_errno) - if ((local_errno > 0) && *strerror(local_errno)) - chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno)); - else - chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno); - + { + if ((local_errno > 0) && *strerror(local_errno)) + chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno)); + else + chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno); + } + chars_written += fprintf(stderr, "\n"); (void) fflush(stderr); diff --git a/c/src/libmisc/monitor/mon-symbols.c b/c/src/libmisc/monitor/mon-symbols.c index 64a05dee9b..1fed3c47f7 100644 --- a/c/src/libmisc/monitor/mon-symbols.c +++ b/c/src/libmisc/monitor/mon-symbols.c @@ -11,17 +11,17 @@ * $Id$ */ -#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ -#include -#include -#include - -/* for strcasecmp in linux */ +/* for strcasecmp in linux and solaris */ #if defined(linux) #define __USE_BSD #endif #include +#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ +#include +#include +#include + #include #include diff --git a/c/src/librtems++/include/rtems++/rtemsInterrupt.h b/c/src/librtems++/include/rtems++/rtemsInterrupt.h index 0dc6a20d5e..f722eb7683 100644 --- a/c/src/librtems++/include/rtems++/rtemsInterrupt.h +++ b/c/src/librtems++/include/rtems++/rtemsInterrupt.h @@ -71,7 +71,7 @@ protected: private: const rtemsInterrupt& operator=(const rtemsInterrupt& ); - Interrupt(const rtemsInterrupt& ); + rtemsInterrupt(const rtemsInterrupt& ); // the vector caught rtems_vector_number vector; diff --git a/c/src/librtems++/src/rtemsMessageQueue.cc b/c/src/librtems++/src/rtemsMessageQueue.cc index 1978e1c6ec..c3183dc2b0 100644 --- a/c/src/librtems++/src/rtemsMessageQueue.cc +++ b/c/src/librtems++/src/rtemsMessageQueue.cc @@ -18,6 +18,7 @@ ------------------------------------------------------------------------ */ +#include #include /* ---- diff --git a/c/src/librtems++/src/rtemsSemaphore.cc b/c/src/librtems++/src/rtemsSemaphore.cc index 1e0d3de472..5821612618 100644 --- a/c/src/librtems++/src/rtemsSemaphore.cc +++ b/c/src/librtems++/src/rtemsSemaphore.cc @@ -18,6 +18,7 @@ ------------------------------------------------------------------------ */ +#include #include /* ---- diff --git a/c/src/librtems++/src/rtemsTask.cc b/c/src/librtems++/src/rtemsTask.cc index d90c8f669f..619f7d4071 100644 --- a/c/src/librtems++/src/rtemsTask.cc +++ b/c/src/librtems++/src/rtemsTask.cc @@ -18,6 +18,7 @@ ------------------------------------------------------------------------ */ +#include #include // include to allow it to be compiled #include diff --git a/c/src/librtems++/src/rtemsTimer.cc b/c/src/librtems++/src/rtemsTimer.cc index b87ffd5e80..835bfd74ce 100644 --- a/c/src/librtems++/src/rtemsTimer.cc +++ b/c/src/librtems++/src/rtemsTimer.cc @@ -18,6 +18,7 @@ ------------------------------------------------------------------------ */ +#include #include /* ---- diff --git a/c/src/make/directory.cfg b/c/src/make/directory.cfg index 1ae1db84bd..27524ed9fb 100644 --- a/c/src/make/directory.cfg +++ b/c/src/make/directory.cfg @@ -38,6 +38,15 @@ $(RECURSE_TARGETS): else ifdef RECURSE_TARGETS $(RECURSE_TARGETS): - set -e; for subd in $(SUB_DIRS); do $(MAKE) -w -C $$subd $@; done + @$(ECHO) ; set -e ; \ + if [ "$(SUB_DIRS)" != "" ] ; then \ + sdirs="$(SUB_DIRS)" ; \ + else \ + sdirs="xxx" ; \ + fi ; \ + if [ "$$sdirs" != "xxx" ] ; then \ + for subd in $$sdirs; do $(MAKE) -w -C $$subd $@; done ;\ + fi endif endif + diff --git a/c/src/tests/samples/cdtest/main.cc b/c/src/tests/samples/cdtest/main.cc index 80de75e3c9..0203ccaba1 100644 --- a/c/src/tests/samples/cdtest/main.cc +++ b/c/src/tests/samples/cdtest/main.cc @@ -21,6 +21,7 @@ #include #include +#include #ifdef RTEMS_TEST_IO_STREAM #include #endif diff --git a/c/src/tests/samples/paranoia/paranoia.c b/c/src/tests/samples/paranoia/paranoia.c index 3b860c3b4a..67228436e1 100644 --- a/c/src/tests/samples/paranoia/paranoia.c +++ b/c/src/tests/samples/paranoia/paranoia.c @@ -154,6 +154,10 @@ #include #include +#if defined(solaris2) +#include +#endif + /* * To compile this on host using only libm from newlib (and using host libc) * do: diff --git a/cpukit/libcsupport/src/__gettod.c b/cpukit/libcsupport/src/__gettod.c index b3f091a1b3..cbec1455be 100644 --- a/cpukit/libcsupport/src/__gettod.c +++ b/cpukit/libcsupport/src/__gettod.c @@ -20,8 +20,8 @@ #include #endif -#include #include +#include #include #include diff --git a/cpukit/libcsupport/src/error.c b/cpukit/libcsupport/src/error.c index 5bd481c3e6..ab4693609e 100644 --- a/cpukit/libcsupport/src/error.c +++ b/cpukit/libcsupport/src/error.c @@ -142,11 +142,13 @@ static int rtems_verror( chars_written += fprintf(stderr, " (status: %s)", rtems_status_text(status)); if (local_errno) - if ((local_errno > 0) && *strerror(local_errno)) - chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno)); - else - chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno); - + { + if ((local_errno > 0) && *strerror(local_errno)) + chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno)); + else + chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno); + } + chars_written += fprintf(stderr, "\n"); (void) fflush(stderr); diff --git a/cpukit/libmisc/monitor/mon-symbols.c b/cpukit/libmisc/monitor/mon-symbols.c index 64a05dee9b..1fed3c47f7 100644 --- a/cpukit/libmisc/monitor/mon-symbols.c +++ b/cpukit/libmisc/monitor/mon-symbols.c @@ -11,17 +11,17 @@ * $Id$ */ -#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ -#include -#include -#include - -/* for strcasecmp in linux */ +/* for strcasecmp in linux and solaris */ #if defined(linux) #define __USE_BSD #endif #include +#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ +#include +#include +#include + #include #include diff --git a/cpukit/score/cpu/unix/cpu.c b/cpukit/score/cpu/unix/cpu.c index 6fe63f844f..219b81f685 100644 --- a/cpukit/score/cpu/unix/cpu.c +++ b/cpukit/score/cpu/unix/cpu.c @@ -14,16 +14,6 @@ #include #include -#if defined(solaris2) -/* -#undef _POSIX_C_SOURCE -#define _POSIX_C_SOURCE 3 -#undef __STRICT_ANSI__ -#define __STRICT_ANSI__ -*/ -#define __EXTENSIONS__ -#endif - #if defined(__linux__) #define MALLOC_0_RETURNS_NULL #endif diff --git a/make/custom/Solaris-posix.cfg b/make/custom/Solaris-posix.cfg index af8d0c1cfe..aeee569900 100644 --- a/make/custom/Solaris-posix.cfg +++ b/make/custom/Solaris-posix.cfg @@ -41,11 +41,21 @@ CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-solaris2.cfg # Use the LIBC support for CYGNUS newlib # RTEMS_LIBC_DIR must already be set (by module file) -RTEMS_USE_NEWLIB=yes +RTEMS_USE_NEWLIB=no + +LIBC_LIBM=-lm # Define this to yes if C++ is included in the development environment # This requires that at least the GNU C++ compiler and libg++ be installed. +ifeq ($(RTEMS_HAS_CPLUSPLUS),yes) +HAS_CPLUSPLUS=yes +# no standard C++ libs provided by default +LIBCC_INCLUDE=$(GNUTOOLS)/include/g++ +CPLUS_LD_LIBS=-lstdc++ +CPLUS_LD_LIBS=$(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA) +else HAS_CPLUSPLUS=no +endif # Define this to yes if this target supports multiprocessor environments. HAS_MP=yes diff --git a/make/directory.cfg b/make/directory.cfg index 1ae1db84bd..27524ed9fb 100644 --- a/make/directory.cfg +++ b/make/directory.cfg @@ -38,6 +38,15 @@ $(RECURSE_TARGETS): else ifdef RECURSE_TARGETS $(RECURSE_TARGETS): - set -e; for subd in $(SUB_DIRS); do $(MAKE) -w -C $$subd $@; done + @$(ECHO) ; set -e ; \ + if [ "$(SUB_DIRS)" != "" ] ; then \ + sdirs="$(SUB_DIRS)" ; \ + else \ + sdirs="xxx" ; \ + fi ; \ + if [ "$$sdirs" != "xxx" ] ; then \ + for subd in $$sdirs; do $(MAKE) -w -C $$subd $@; done ;\ + fi endif endif + diff --git a/testsuites/samples/cdtest/main.cc b/testsuites/samples/cdtest/main.cc index 80de75e3c9..0203ccaba1 100644 --- a/testsuites/samples/cdtest/main.cc +++ b/testsuites/samples/cdtest/main.cc @@ -21,6 +21,7 @@ #include #include +#include #ifdef RTEMS_TEST_IO_STREAM #include #endif diff --git a/testsuites/samples/paranoia/paranoia.c b/testsuites/samples/paranoia/paranoia.c index 3b860c3b4a..67228436e1 100644 --- a/testsuites/samples/paranoia/paranoia.c +++ b/testsuites/samples/paranoia/paranoia.c @@ -154,6 +154,10 @@ #include #include +#if defined(solaris2) +#include +#endif + /* * To compile this on host using only libm from newlib (and using host libc) * do: diff --git a/tools/build/eolstrip.c b/tools/build/eolstrip.c index d15151c8b0..467b352322 100644 --- a/tools/build/eolstrip.c +++ b/tools/build/eolstrip.c @@ -197,7 +197,7 @@ process(char *arg) if ( buffer[ length ] != '\n' ) error(ERR_ERRNO|ERR_FATAL, "Line %d too long in %s\n", line_number, arg); - while ( isspace( buffer[ length ] ) ) + while ( isspace( (int) buffer[ length ] ) ) buffer[ length-- ] = '\0'; if ( test_only ) { diff --git a/tools/build/packhex.c b/tools/build/packhex.c index aa92761a91..9d19ce39e1 100644 --- a/tools/build/packhex.c +++ b/tools/build/packhex.c @@ -478,7 +478,7 @@ int main( } while ( gets( inbuff ) != NULL ); - exit( EXIT_SUCCESS ); + return ( EXIT_SUCCESS ); } diff --git a/tools/build/src/eolstrip.c b/tools/build/src/eolstrip.c index d15151c8b0..467b352322 100644 --- a/tools/build/src/eolstrip.c +++ b/tools/build/src/eolstrip.c @@ -197,7 +197,7 @@ process(char *arg) if ( buffer[ length ] != '\n' ) error(ERR_ERRNO|ERR_FATAL, "Line %d too long in %s\n", line_number, arg); - while ( isspace( buffer[ length ] ) ) + while ( isspace( (int) buffer[ length ] ) ) buffer[ length-- ] = '\0'; if ( test_only ) { diff --git a/tools/build/src/packhex.c b/tools/build/src/packhex.c index aa92761a91..9d19ce39e1 100644 --- a/tools/build/src/packhex.c +++ b/tools/build/src/packhex.c @@ -478,7 +478,7 @@ int main( } while ( gets( inbuff ) != NULL ); - exit( EXIT_SUCCESS ); + return ( EXIT_SUCCESS ); } -- cgit v1.2.3