*** empty log message ***

7 files changed, 24 insertions, 16 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/vcr.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/vcr.cpp
index e6ab1dbefc2..079d8563350 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/vcr.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/vcr.cpp
@@ -55,7 +55,7 @@
 #else
 #include <bsd/netinet/in.h>
 #endif
-#if defined(SunOS) || defined(FreeBSD)
+#if defined(sun) || defined(FreeBSD)
 #include <stdlib.h>
 #endif
 #include <time.h>
@@ -67,7 +67,7 @@
 #include "include/common.h"
 
 #include "mpeg_client/video.h"
-#include "proto.h"
+#include "mpeg_client/proto.h"
 #include "mpeg_client/newproto.h"
 #include "mpeg_client/global.h"
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/audio.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/audio.cpp
index 0e05cc70c1d..26c51cde912 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/audio.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/audio.cpp
@@ -42,7 +42,7 @@
 #include <sys/audioio.h>
 #elif defined(FreeBSD)
 #include <machine/pcaudioio.h>
-#elif defined(SunOS)
+#elif defined(sun)
 #include <sys/audioio.h>
 #elif defined(_HPUX_SOURCE)
 #include <sys/audio.h>
@@ -53,7 +53,7 @@
 #ifdef FreeBSD
 #define AUDIO_DEVICE "/dev/pcaudio"
 #define AUDIO_CONTROL "/dev/pcaudioctl"
-#elif defined(__svr4__) || defined(SunOS)
+#elif defined(__svr4__) || defined(sun)
 #define AUDIO_DEVICE "/dev/audio"
 #define AUDIO_CONTROL "/dev/audioctl"
 #elif defined(_HPUX_SOURCE)
@@ -168,7 +168,7 @@ int InitAudioDevice(void)
   useAF = 1;
   fprintf(stderr, "Using default AudioFile.\n");
   return 0;
-#elif defined(__svr4__) || defined(SunOS) || defined(FreeBSD) \
+#elif defined(__svr4__) || defined(sun) || defined(FreeBSD) \
   || defined(_HPUX_SOURCE) || defined(IRIX) || defined(LINUX)
   fprintf(stderr, "This vcr compiled without AudioFile, try native audio.\n");
 #else
@@ -179,7 +179,7 @@ int InitAudioDevice(void)
   
  native_audio:
   
-#if defined(__svr4__) || defined(SunOS) || defined(FreeBSD) || defined(_HPUX_SOURCE)
+#if defined(__svr4__) || defined(sun) || defined(FreeBSD) || defined(_HPUX_SOURCE)
 
   afd = open(AUDIO_DEVICE, O_WRONLY | O_NDELAY);
   if (afd == -1) {
@@ -282,7 +282,7 @@ int InitAudioDevice(void)
   afd = -1;
   return -1;
 
-#endif  /* SunOS, FreeBSD, _HPUX_SOURCE, ... */
+#endif  /* sun, FreeBSD, _HPUX_SOURCE, ... */
   shared->AFPara.encodeType = AudioTypeMuLaw;
   shared->AFPara.channels = 1;
   shared->AFPara.bytesPerSample = 1;
@@ -302,7 +302,7 @@ unsigned int GetAudioTime(void)
 #ifdef AUDIOFILE
   if (useAF) return AFGetTime(ac);
 #endif
-#if defined(__svr4__) || defined(SunOS) || defined(FreeBSD) \
+#if defined(__svr4__) || defined(sun) || defined(FreeBSD) \
   || defined(_HPUX_SOURCE) || defined(IRIX) || defined(LINUX)
   if (afd == -1) return 0;
   return get_duration(start_time, get_msec()) * 8; /* 8K sampling speed */
@@ -319,7 +319,7 @@ unsigned int PlayAudioSamples(unsigned int time, char * buf, int size)
 				  (unsigned char *)buf);
 #endif
 
-#if defined(__svr4__) || defined(SunOS) || defined(FreeBSD) \
+#if defined(__svr4__) || defined(sun) || defined(FreeBSD) \
   || defined(_HPUX_SOURCE) || defined(IRIX) || defined(LINUX)
   if (afd == -1) return 0;
 
@@ -392,7 +392,7 @@ void StartAudioPlaySession(void)
 #ifdef AUDIOFILE
   if (useAF) return;
 #endif
-#if defined(__svr4__) || defined(SunOS) || defined(FreeBSD) \
+#if defined(__svr4__) || defined(sun) || defined(FreeBSD) \
   || defined(_HPUX_SOURCE) || defined(IRIX)
   if (afd == -1) return;
 #else
@@ -401,7 +401,7 @@ void StartAudioPlaySession(void)
 }
 void SetAudioGain(void)
 {
-#if defined(__svr4__) || defined(SunOS) || defined(FreeBSD)
+#if defined(__svr4__) || defined(sun) || defined(FreeBSD)
   audio_info_t sun_gapo;
 #elif defined(_HPUX_SOURCE)
   struct audio_gain ag;
@@ -420,7 +420,7 @@ void SetAudioGain(void)
     return;
   }
 #endif
-#if defined(__svr4__) || defined(SunOS) || defined(FreeBSD)
+#if defined(__svr4__) || defined(sun) || defined(FreeBSD)
    if (afd == -1) return;
   ioctl(cfd, AUDIO_GETINFO, &sun_gapo);
   sun_gapo.play.gain = volume * 2;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/file.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/file.cpp
index 1f939dcd012..871741f239f 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/file.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/file.cpp
@@ -33,7 +33,7 @@
 #include <Xm/Text.h>
 #include <Xm/FileSB.h>
 #include <Xm/DialogS.h>
-#if defined(SunOS) || defined(FreeBSD)
+#if defined(sun) || defined(FreeBSD)
 #include <stdlib.h>
 #endif
 #include "include/common.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.cpp
index 0a39e088109..b29b2b3b796 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.cpp
@@ -25,6 +25,9 @@
 #include "proto.h"
 #include "util.h"
 
+#define TRUE 1
+#define FALSE 0
+
 /* Declarations of global variables used. */
 
 unsigned int curBits;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.h
index 99e15338b22..272e0add31d 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.h
@@ -22,10 +22,12 @@
 
 /* Status codes for bit stream i/o operations. */
 
+#if !defined (AV_UTIL_H)
+#define AV_UTIL_H
+
 #define NO_VID_STREAM -1
 #define UNDERFLOW -2
 #define OK 1
-
 /* Size increment of extension data buffers. */
 
 #define EXT_BUF_SIZE 1024
@@ -361,3 +363,6 @@ extern unsigned int *bitBuffer;
 #endif
 
 #define UTIL2
+
+#endif /* if !defined (AV_UTIL_H) */
+
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 53808c491dd..aebcfa35b66 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.cpp
@@ -401,7 +401,7 @@ void setsignal(int sig, void (func)(int))
     perror("");
     exit(1);
   }
-#elif defined(SunOS) || defined(FreeBSD) || defined(ULTRIX) || defined(LINUX)
+#elif defined(sun) || defined(FreeBSD) || defined(ULTRIX) || defined(LINUX)
   {
     struct sigaction act;
     act.sa_handler = func;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile
index 0e8909ede2c..d5b87b7b18f 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile
@@ -17,7 +17,7 @@ DEFS    = $(addsuffix .h,$(FILES))
 LSRC	= $(addsuffix .cpp,$(FILES))
 
 
-LIBS 	+= -lTAO -lACE
+LIBS 	+= -lTAO -lACE -lorbsvcs
 
 MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source
 CPPFLAGS += -I$(MPEG_ROOT)