diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared')
3 files changed, 7 insertions, 5 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile index f756a1d14fa..d700ba3afb5 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile @@ -72,8 +72,11 @@ CPPFLAGS += -DSH_MEM -DNDEBUG idl_stubs: $(addsuffix .h, $(IDL_FILES)) +clean: + -/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state + realclean: clean - -$(RM) $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES)) + -/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES)) # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.cpp index 254daea63ae..e4fa8d8a6b5 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.cpp @@ -132,11 +132,11 @@ long get_duration(long val1, long val2) #ifdef LINUX #else -int usleep(unsigned int usec) +void usleep(unsigned int usec) { struct timeval val; - if (usec <= 0) return -1; + if (usec <= 0) return; val.tv_sec = usec / 1000000; val.tv_usec = usec % 1000000; if (select(0, NULL, NULL, NULL, &val) == -1 && errno != 4) @@ -144,7 +144,6 @@ int usleep(unsigned int usec) ACE_OS::perror ("sleep with select"); ACE_OS::exit (1); } - return 0; } #endif diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h index 6afb41a69ee..fa55050458b 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h @@ -30,7 +30,7 @@ #include "include/common.h" #ifdef LINUX #else -int usleep(unsigned int usec); +void usleep(unsigned int usec); #endif void beep(void); int get_hostname(char *name, int len); |