What follows is the diff on the original DSS-IPv6 code compared to modified to compile on Apple Intel Transition Kit. I've chopped out some unnecessary things from the diff output. I created a couple of new files for convienience - Builxxxxxx.intel - and they are included in this diff output (and make up about 500 lines of the total 600 odd. There were really no code changes required - just correct include/exclude of header files. trans:~/Desktop/OriginalDSS-IPv6-MacOSX/IPv6DSS-clean dan$ diff -w -r -N -x *.o -x *.a -x *.xo -x buil* -x *.xcodeproj Darwin/src/live/StreamingServer/ ~/Desk top/IPv6DSS-first/Darwin/src/live/StreamingServer/ >> diff-r-w-N-excludesbuildxc od-out.txt diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/BuildOSXInstallerPkg.intel /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/BuildOSXInstallerPkg.intel 0a1,150 > #!/bin/sh > if [ "$1" = "" ] ; then > echo "example: BuildOSXInstallerPkg [ dss | qtss_test | dss_apple ] [ update ]" > echo "[ dss ] is the public DarwinStreamingServer installer" > echo "[ qtss_apple ] is the private Apple QuickTimeStreamingServer installer" > echo "[ dss_apple ] is the private Apple DarwinStreamingServer installer" > echo "[ update ] Don't clean just update the build before creating installer" > else > if [ `id -u` != 0 ] > then > echo "### You must be root or use sudo to build the installer. ###" > exit 1 > fi > > if [ `uname` = "Darwin" ]; then > if [ "$2" = "update" ] ; then > echo "update" > else > rm -rf /tmp/StreamingServer.dst > rm -rf ./build > fi > > if [ -e /usr/bin/pbxbuild ] ; then > BUILDTOOL="pbxbuild" > else > BUILDTOOL="xcodebuild" > fi > > if [ "$1" = "dss" ] ; then > ./UpdateDSSInstallerDocs > echo "Build DarwinStreamingServer and installer" > > rm -rf ./DarwinStreamingServer.pkg > ./Buildit.intel dss install > > echo "Build Dynamic Modules" > rm -rf build/QTSSRefMovieModule.bundle > rm -rf build/QTSSHomeDirectoryModule.bundle > rm -rf /tmp/StreamingServer.dst/Library/QuickTimeStreaming/Modules/QTSSRefMovieModule.bundle > rm -rf /tmp/StreamingServer.dst/Library/QuickTimeStreaming/Modules/QTSSHomeDirectoryModule.bundle > $BUILDTOOL -target QTSSRefMovieModule.bundle > $BUILDTOOL -target QTSSHomeDirectoryModule.bundle > cp -Rf build/QTSSRefMovieModule.bundle /tmp/StreamingServer.dst/Library/QuickTimeStreaming/Modules > cp -Rf build/QTSSHomeDirectoryModule.bundle /tmp/StreamingServer.dst/Library/QuickTimeStreaming/Modules > > if [ -e "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker" ]; then > /Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker -build -p `pwd`/DarwinStreamingServer.pkg -f /tmp/StreamingServer.dst/ -r pubPackageMetaData/pubPackageMetaData/DarwinStreamingServer.pkg/Contents/Resources/ -i pubPackageMetaData/pubPackageMetaData/DarwinStreamingServer.pkg/Contents/Info.plist > else > /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -p `pwd`/DarwinStreamingServer.pkg -f /tmp/StreamingServer.dst/ -r pubPackageMetaData/pubPackageMetaData/DarwinStreamingServer.pkg/Contents/Resources/ -i pubPackageMetaData/pubPackageMetaData/DarwinStreamingServer.pkg/Contents/Info.plist > fi > > #delete default untitled description, we will use the language version > echo `date` "*remove default description*" > rm ./DarwinStreamingServer.pkg/Contents/Resources/Description.plist > > #copy the english languge files to the installer > cp -Rf pubPackageMetaData/pubPackageMetaData/DarwinStreamingServer.pkg/Contents/Resources ./DarwinStreamingServer.pkg/Contents/ > > #remove english error messages so installer uses the default localized strings. > echo `date` "*remove english strings*" > rm ./DarwinStreamingServer.pkg/Contents/Resources/English.lproj/VolumeCheck.strings > > #delete the CVS dirs > echo `date` "*Look for and remove any CVS directories*" > ./deleteCVSdirs ./DarwinStreamingServer.pkg > > echo `date` "DarwinStreamingServer Package created at "`pwd`"/DarwinStreamingServer.pkg." > fi > > if [ "$1" = "qtss_apple" ] ; then > echo "Build QuickTimeStreamingServer installer" > > rm -rf ./QuickTimeStreamingServer.pkg > ./Buildit.intel qtss install > > echo "Build Dynamic Modules" > rm -rf build/QTSSRefMovieModule.bundle > rm -rf build/QTSSHomeDirectoryModule.bundle > rm -rf /tmp/StreamingServer.dst/Library/QuickTimeStreaming/Modules/QTSSRefMovieModule.bundle > rm -rf /tmp/StreamingServer.dst/Library/QuickTimeStreaming/Modules/QTSSHomeDirectoryModule.bundle > $BUILDTOOL -target QTSSRefMovieModule.bundle > $BUILDTOOL -target QTSSHomeDirectoryModule.bundle > cp -Rf build/QTSSRefMovieModule.bundle /tmp/StreamingServer.dst/Library/QuickTimeStreaming/Modules > cp -Rf build/QTSSHomeDirectoryModule.bundle /tmp/StreamingServer.dst/Library/QuickTimeStreaming/Modules > > if [ -e "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker" ]; then > /Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker -build -p `pwd`/QuickTimeStreamingServer.pkg -f /tmp/StreamingServer.dst/ -r pubPackageMetaData/pubPackageMetaData/DarwinStreamingServer.pkg/Contents/Resources/ -i pubPackageMetaData/pubPackageMetaData/DarwinStreamingServer.pkg/Contents/Info.plist > else > /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -p `pwd`/QuickTimeStreamingServer.pkg -f /tmp/StreamingServer.dst/ -r pubPackageMetaData/pubPackageMetaData/DarwinStreamingServer.pkg/Contents/Resources/ -i pubPackageMetaData/pubPackageMetaData/DarwinStreamingServer.pkg/Contents/Info.plist > fi > > #delete default untitled description, we will use the language version > echo `date` "*remove default description*" > rm ./QuickTimeStreamingServer.pkg/Contents/Resources/Description.plist > > #copy all the language files and the installer script files to the installer > cp -rf qtssPackageMetaData/qtssPackageMetaData/QuickTimeStreamingServer.pkg/Contents/Resources/ ./QuickTimeStreamingServer.pkg/Contents/Resources/ > > #delete the CVS dirs > echo `date` "*Look for and remove any CVS directories*" > ./deleteCVSdirs ./QuickTimeStreamingServer.pkg > > echo `date` "QuickTimeStreamingServer Package created at "`pwd`"/QuickTimeStreamingServer.pkg." > fi > > if [ "$1" = "dss_apple" ] ; then > ./UpdateDSSInstallerDocs > > echo "Build Apple DarwinStreamingServer installer" > > rm -rf ./DarwinStreamingServer.pkg > ./Buildit.intel qtss install > > echo "Build Dynamic Modules" > rm -rf build/QTSSRefMovieModule.bundle > rm -rf build/QTSSHomeDirectoryModule.bundle > rm -rf /tmp/StreamingServer.dst/Library/QuickTimeStreaming/Modules/QTSSRefMovieModule.bundle > rm -rf /tmp/StreamingServer.dst/Library/QuickTimeStreaming/Modules/QTSSHomeDirectoryModule.bundle > $BUILDTOOL -target QTSSRefMovieModule.bundle > $BUILDTOOL -target QTSSHomeDirectoryModule.bundle > cp -Rf build/QTSSRefMovieModule.bundle /tmp/StreamingServer.dst/Library/QuickTimeStreaming/Modules > cp -Rf build/QTSSHomeDirectoryModule.bundle /tmp/StreamingServer.dst/Library/QuickTimeStreaming/Modules > > if [ -e "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker" ]; then > /Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker -build -p `pwd`/DarwinStreamingServer.pkg -f /tmp/StreamingServer.dst/ -r pubPackageMetaData/pubPackageMetaData/DarwinStreamingServer.pkg/Contents/Resources/ -i pubPackageMetaData/pubPackageMetaData/DarwinStreamingServer.pkg/Contents/Info.plist > else > /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -p `pwd`/DarwinStreamingServer.pkg -f /tmp/StreamingServer.dst/ -r pubPackageMetaData/pubPackageMetaData/DarwinStreamingServer.pkg/Contents/Resources/ -i pubPackageMetaData/pubPackageMetaData/DarwinStreamingServer.pkg/Contents/Info.plist > fi > > rm ./DarwinStreamingServer.pkg/Contents/Resources/Description.plist > > #copy the english languge files to the installer > cp -Rf pubPackageMetaData/pubPackageMetaData/DarwinStreamingServer.pkg/Contents/Resources ./DarwinStreamingServer.pkg/Contents/ > > #delete default untitled description, we will use the language version > echo `date` "*remove default description*" > if [ -e "./DarwinStreamingServer.pkg/Contents/Resources/Description.plist" ]; then > rm ./DarwinStreamingServer.pkg/Contents/Resources/Description.plist > fi > > #delete the CVS dirs > echo `date` "*Look for and remove any CVS directories*" > ./deleteCVSdirs ./DarwinStreamingServer.pkg > > echo `date` "DarwinStreamingServer Package created at " `pwd` "/DarwinStreamingServer.pkg." > fi > > fi > fi > diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/Buildit.intel /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/Buildit.intel 0a1,365 > #!/bin/sh > > ##Build script for Darwin Streaming Server > if [ "$*" = "install" ] ; then > ./buildtarball dss > exit 0 > fi > > OSNAME=`uname` > HARDWARENAME=`uname -m` > > PLAT=$OSNAME.$HARDWARENAME > > echo "Darwin Streaming Server" > echo "-----------------------" > > > case $PLAT in > > Linux.ppc) > echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform" > CPLUS=gcc > CCOMP=gcc > LINKER='gcc' > MAKE=make > > COMPILER_FLAGS= "-D__linuxppc__ -Wno-multichar -pipe" > INCLUDE_FLAG="-include" > > CORE_LINK_LIBS="-lpthread -ldl -lm -lcrypt" > > SHARED=-shared > MODULE_LIBS= > > if [ -f /usr/include/socketbits.h ]; then > NEED_SOCKETBITS=1 > export NEED_SOCKETBITS > fi > ;; > > Linux.i586 | \ > Linux.i686) > echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform" > CPLUS=gcc > CCOMP=gcc > LINKER='gcc' > MAKE=make > > #FedoraCore3 linux has real ifaddrs.h - so use the have_getifaddrs define instead - refer to BSD in here > #Should really change this to do an "if [ -f /usr/include/ifaddrs.h then -DHave_GETIFADDRS > # COMPILER_FLAGS="-g -pthread -D_REENTRANT -D__USE_POSIX -D__linux__ -pipe" > COMPILER_FLAGS=" -g -D_REENTRANT -D__USE_POSIX -D__linux__ -pipe -DHAVE_GETIFADDRS" > INCLUDE_FLAG="-include" > > # CORE_LINK_LIBS=" -ldl -lstdc++ -lm -lcrypt -lc" > CORE_LINK_LIBS="-lpthread -ldl -lstdc++ -lm -lcrypt" > > SHARED=-shared > MODULE_LIBS= > > if [ -f /usr/include/socketbits.h ]; then > NEED_SOCKETBITS=1 > export NEED_SOCKETBITS > fi > ;; > > Linux.mips) > echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform" > CPLUS=gcc > CCOMP=gcc > LINKER='egcs' > MAKE=make > > COMPILER_FLAGS="-D_REENTRANT -D__linux__ -Wno-multichar -pipe" > INCLUDE_FLAG="-include" > > # CORE_LINK_LIBS="-g -lpthread -ldl -lm -lcrypt" > CORE_LINK_LIBS="-lpthread -ldl -lm -lcrypt" > > SHARED=-shared > MODULE_LIBS= > > if [ -f /usr/include/socketbits.h ]; then > NEED_SOCKETBITS=1 > export NEED_SOCKETBITS > fi > ;; > > FreeBSD.i386) > echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform" > CPLUS=g++ > # CPLUS=gcc > CCOMP=gcc > # LINKER="gcc" > LINKER="g++" > MAKE=gmake > > COMPILER_FLAGS=-DHAVE_GETIFADDRS > INCLUDE_FLAG="-include" > > CORE_LINK_LIBS="-pthread -lm -lcrypt" > > SHARED=-shared > MODULE_LIBS="-lgcc -lstdc++" > ;; > > # SunOS.sun4m | \ > # SunOS.sun4u) > SunOS.*) > echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform" > CPLUS=g++ > CCOMP=gcc > LINKER="g++" > MAKE=make > > COMPILER_FLAGS="-D__solaris__ -D_REENTRANT -L/usr/local/lib -R/usr/local/lib" > INCLUDE_FLAG="-include" > > CORE_LINK_LIBS="-lpthread -ldl -lsocket -lnsl -lresolv -lm -lcrypt -lstdc++" > > SHARED=-G > MODULE_LIBS= > ;; > > IRIX*.*) > # IRIX with MipsPro compiler > # Change all references of Makefile.POSIX below to Makefile.IRIX > echo "Configuring for the "$OSNAME" "$HARDWARENAME" SGI platform" > CPLUS=CC > CCOMP=cc > LINKER="CC" > # GNU make is required. Obtain from freeware.sgi.com > MAKE=/usr/freeware/bin/gmake > # defines from PlatformHeader.h defined here as MipsPro does not support -include pre-processor directive > COMPILER_FLAGS="-D__sgi__ -DirixMipsPro -D_SGI_REENTRANT_FUNCTIONS -DASSERT -D__PTHREADS__ -D__PTHREADS_MUTEXES__ -DBIGENDIAN -DUSE_THREAD -DEXPORT -D_REENTRANT" > INCLUDE_FLAG= > CORE_LINK_LIBS="-ldl -lm -lcrypt -lpthread" > SHARED=-shared > MODULE_LIBS= > ;; > > HP-UX.*) > echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform" > CPLUS=gcc > CCOMP=gcc > LINKER=gcc > MAKE=make > > COMPILER_FLAGS="-D__hpux__ -g -fPIC" > INCLUDE_FLAG="-include" > > CORE_LINK_LIBS="-lpthread -lnsl -lm -lcrypt -lstdc++" > > SHARED=-shared > MODULE_LIBS="-lgcc -lstdc++" > ;; > > OSF1.alpha) > echo "Configuring for the "$OSNAME" "$HARDWARENAME" Tru64 UNIX platform" > CPLUS=`pwd`/my_tru64_cxx > CCOMP=`pwd`/my_tru64_cc > LINKER="cxx" > MAKE=/usr/local/bin/make > > COMPILER_FLAGS="-D__osf__ -DTRUCLUSTER -pthread" > INCLUDE_FLAG="-FI" > > CORE_LINK_LIBS="-lpthread -lclu -lm" > > SHARED=-shared > MODULE_LIBS= > ;; > > "Darwin.Power Macintosh") > echo "Configuring for "$OSNAME" on "$HARDWARENAME". This is a pbxbuild of the QuickTimeStreamingServer." > > ;; > "Darwin.x86") > echo "Configuring for "$OSNAME" on "$HARDWARENAME". This is a xcodebuild of the QuickTimeStreamingServer." > > ;; > > > *) > echo "I don't know your platform. I'll assume this is a Linux x86 platform." > echo "Please edit the BuildServer script & PlatformHeader.h to add your platform." > CPLUS=gcc > CCOMP=gcc > LINKER='egcs' > MAKE=make > > COMPILER_FLAGS=-D__linux__ > INCLUDE_FLAG="-include" > > CORE_LINK_LIBS="-lpthread -ldl -lm -lcrypt" > > SHARED=-shared > MODULE_LIBS= > > if [ -f /usr/include/socketbits.h ]; then > NEED_SOCKETBITS=1 > export NEED_SOCKETBITS > fi > ;; > esac > > if [ "$*" = "install" ] ; then > > if [ `uname` != "SunOS" ]; then > USERID=`id -u` > else > USERID=`/usr/xpg4/bin/id -u` > fi > > if [ $USERID != 0 ]; then > echo "You must be root to perform an \"install\" build" > exit 1 > fi > fi > > echo Building for $PLAT with $CPLUS > > #if [ "${PLAT}" = "Darwin.Power Macintosh" ]; then > if [ "${PLAT}" = "Darwin.x86" ]; then > if [ -e /usr/bin/pbxbuild ] ; then > BUILDTOOL="pbxbuild" > else > BUILDTOOL="xcodebuild" > fi > > if [ "$1" = "" ] ; then > echo "$BUILDTOOL DarwinStreamingServer" > $BUILDTOOL -target DSS > else > if [ "$1" = "dss" ] ; then > echo "$BUILDTOOL DarwinStreamingServer $1" > $BUILDTOOL -target DSS -buildstyle Deployment $2 > else > if [ "$1" = "qtss" ] ; then > echo "$BUILDTOOL QuickTimeStreamingServer $*" > $BUILDTOOL -target QTSS -buildstyle Deployment $2 > else > echo "build $BUILDTOOL $*" > $BUILDTOOL $* > fi > fi > fi > > else > export CPLUS > export CCOMP > export LINKER > export COMPILER_FLAGS > export INCLUDE_FLAG > export CORE_LINK_LIBS > export SHARED > export MODULE_LIBS > > echo Building CommonUtilitiesLib for $PLAT with $CPLUS > cd CommonUtilitiesLib/ > $MAKE -f Makefile.POSIX $* > > echo Building QTFileLib internal for $PLAT with $CPLUS > cd ../QTFileLib/ > > if [ "$*" = "clean" ] ; then > $MAKE -f Makefile.POSIX $* > else > $MAKE -f Makefile.POSIX all $* > fi > > echo Building StreamingServer for $PLAT with $CPLUS > cd .. > > $MAKE -f Makefile.POSIX $* > > echo Building RefMovieModule for $PLAT with $CPLUS > cd APIModules/QTSSRefMovieModule/ > $MAKE -f Makefile.POSIX $* > > echo Building DemoAuthorizationModule for $PLAT with $CPLUS > cd ../QTSSDemoAuthorizationModule.bproj/ > $MAKE -f Makefile.POSIX $* > > echo Building RawFileModule for $PLAT with $CPLUS > cd ../QTSSRawFileModule.bproj/ > $MAKE -f Makefile.POSIX $* > > echo Building SpamDefenseModule for $PLAT with $CPLUS > cd ../QTSSSpamDefenseModule.bproj/ > $MAKE -f Makefile.POSIX $* > > echo Building HomeDirectoryModule for $PLAT with $CPLUS > cd ../QTSSHomeDirectoryModule/ > $MAKE -f Makefile.POSIX $* > > cd .. > > echo Building StreamingProxy for $PLAT with $CPLUS > cd ../StreamingProxy.tproj/ > $MAKE -f Makefile.POSIX $* > > echo Building qtpasswd for $PLAT with $CPLUS > cd ../qtpasswd.tproj/ > $MAKE -f Makefile.POSIX $* > > echo Building PlaylistBroadcaster for $PLAT with $CPLUS > cd ../PlaylistBroadcaster.tproj/ > $MAKE -f Makefile.POSIX $* > > echo Building MP3Broadcaster for $PLAT with $CPLUS > cd ../MP3Broadcaster/ > $MAKE -f Makefile.POSIX $* > > echo Building QTFileTools for $PLAT with $CPLUS > cd ../QTFileTools/ > > echo Building QTBroadcaster for $PLAT with $CPLUS > cd QTBroadcaster.tproj/ > $MAKE -f Makefile.POSIX $* > > echo Building QTFileInfo for $PLAT with $CPLUS > cd ../QTFileInfo.tproj/ > $MAKE -f Makefile.POSIX $* > > echo Building QTFileTest for $PLAT with $CPLUS > cd ../QTFileTest.tproj/ > $MAKE -f Makefile.POSIX $* > > echo Building QTRTPFileTest for $PLAT with $CPLUS > cd ../QTRTPFileTest.tproj/ > $MAKE -f Makefile.POSIX $* > > echo Building QTRTPGen for $PLAT with $CPLUS > cd ../QTRTPGen.tproj/ > $MAKE -f Makefile.POSIX $* > > echo Building QTSDPGen for $PLAT with $CPLUS > cd ../QTSDPGen.tproj/ > $MAKE -f Makefile.POSIX $* > > echo Building QTSampleLister for $PLAT with $CPLUS > cd ../QTSampleLister.tproj/ > $MAKE -f Makefile.POSIX $* > > echo Building QTTrackInfo for $PLAT with $CPLUS > cd ../QTTrackInfo.tproj/ > $MAKE -f Makefile.POSIX $* > > cd .. > > if [ -d ../StreamingLoadTool ]; then > echo Building StreamingLoadTool for $PLAT with $CPLUS > cd ../StreamingLoadTool/ > $MAKE -f Makefile.POSIX $* > fi > > if [ "$*" = "install" ] ; then > cd .. > pwdi > echo > ./DSS_MakeRoot / > fi > > fi diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/CommonUtilitiesLib/Address.h /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/CommonUtilitiesLib/Address.h 52c52 < #if __Win32__ || __MacOSX__ || __osf__ || __sgi__ || __hpux__ --- > #if __Win32__ || __osf__ || __sgi__ || __hpux__ diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/CommonUtilitiesLib/Socket.cpp /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/CommonUtilitiesLib/Socket.cpp 55c55 < #if defined(__Win32__) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__) --- > #if defined(__Win32__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__) 186c186 < #if defined(__Win32__) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__) --- > #if defined(__Win32__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__) diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/CommonUtilitiesLib/TCPListenerSocket.cpp /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/CommonUtilitiesLib/TCPListenerSocket.cpp 91c91 < #if __Win32__ || __MacOSX__ || __osf__ || __sgi__ || __hpux__ --- > #if __Win32__ || __osf__ || __sgi__ || __hpux__ diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/CommonUtilitiesLib/TCPSocket.cpp /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/CommonUtilitiesLib/TCPSocket.cpp 76c76 < #if __Win32__ || __MacOSX__ || __osf__ || __sgi__ || __hpux__ --- > #if __Win32__ || __osf__ || __sgi__ || __hpux__ diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/CommonUtilitiesLib/UDPSocket.cpp /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/CommonUtilitiesLib/UDPSocket.cpp 97c97 < #if __Win32__ || __MacOSX__ || __osf__ || __sgi__ || __hpux__ --- > #if __Win32__ || __osf__ || __sgi__ || __hpux__ diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/PlaylistBroadcaster.tproj/playlist_elements.cpp /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/PlaylistBroadcaster.tproj/playlist_elements.cpp 736c736 < #if __Win32__ || __MacOSX__ || __osf__ || __sgi__ || __hpux__ --- > #if __Win32__ || __osf__ || __sgi__ || __hpux__ diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/QTFileTools/QTBroadcaster.tproj/QTBroadcaster.cpp /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/QTFileTools/QTBroadcaster.tproj/QTBroadcaster.cpp 32c32 < #ifndef __MacOSX__ --- > // dan got rid of this check #ifndef __MacOSX__ 35c35 < #endif --- > // dan got rid of this check #endif diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/QTFileTools/QTFileInfo.tproj/QTFileInfo.cpp /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/QTFileTools/QTFileInfo.tproj/QTFileInfo.cpp 31c31 < #ifndef __MacOSX__ --- > // dan got rid of this check #ifndef __MacOSX__ 34c34 < #endif --- > // dan got rid of this check #endif diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/QTFileTools/QTRTPFileTest.tproj/QTRTPFileTest.cpp /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/QTFileTools/QTRTPFileTest.tproj/QTRTPFileTest.cpp 32c32 < #ifndef __MacOSX__ --- > // dan got rid of this check #ifndef __MacOSX__ 35c35 < #endif --- > // dan got rid of this check #endif diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/QTFileTools/QTRTPGen.tproj/QTRTPGen.cpp /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/QTFileTools/QTRTPGen.tproj/QTRTPGen.cpp 33c33 < #ifndef __MacOSX__ --- > // dan got rid of this check #ifndef __MacOSX__ 36c36 < #endif --- > // dan got rid of this check #endif diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/QTFileTools/QTSDPGen.tproj/QTSDPGen.cpp /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/QTFileTools/QTSDPGen.tproj/QTSDPGen.cpp 31c31 < #ifndef __MacOSX__ --- > // dan got rid of this check #ifndef __MacOSX__ 34c34 < #endif --- > // dan got rid of this check #endif diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/QTFileTools/QTSampleLister.tproj/QTSampleLister.cpp /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/QTFileTools/QTSampleLister.tproj/QTSampleLister.cpp 32c32 < #ifndef __MacOSX__ --- > // dan got rid of this check #ifndef __MacOSX__ 35c35 < #endif --- > // dan got rid of this check #endif diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/QTFileTools/QTTrackInfo.tproj/QTTrackInfo.cpp /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/QTFileTools/QTTrackInfo.tproj/QTTrackInfo.cpp 37c37 < #ifndef __MacOSX__ --- > // dan got rid of this check #ifndef __MacOSX__ 40c40 < #endif --- > // dan got rid of this check #endif diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/QTFileTools/RTPFileGen.tproj/RTPFileGen.cpp /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/QTFileTools/RTPFileGen.tproj/RTPFileGen.cpp 34c34 < #ifndef __MacOSX__ --- > // dan got rid of this check #ifndef __MacOSX__ 37c37 < #endif --- > // dan got rid of this check #endif diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/Server.tproj/RTSPSession.cpp /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/Server.tproj/RTSPSession.cpp 50c50 < #if __FreeBSD__ || __hpux__ --- > #if __FreeBSD__ || __hpux__ || __MacOSX__ diff -w -r -N -x '*.o' -x '*.a' -x '*.xo' -x 'buil*' -x '*.xcodeproj' Darwin/src/live/StreamingServer/revision.h /Users/dan/Desktop/IPv6DSS-first/Darwin/src/live/StreamingServer/revision.h 32c32 < #define kBuildString "464.1.1" --- > #define kBuildString "464.1.86" 38c38 < #define kCommentString "Release/5; IPv6/half-baked/xcode; " --- > #define kCommentString "Release/5; IPv6/half-baked/xcode;x86"