diff -udNr DarwinStreamingSrvr5.5.5-Source-orig/Buildit DarwinStreamingSrvr5.5.5-Source/Buildit
--- DarwinStreamingSrvr5.5.5-Source-orig/Buildit 2007-11-02 20:18:20.000000000 +0100
+++ DarwinStreamingSrvr5.5.5-Source/Buildit 2007-11-02 20:16:06.000000000 +0100
@@ -79,6 +79,27 @@
fi
;;
+ Linux.x86_64)
+ echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
+ CPLUS=gcc
+ CCOMP=gcc
+ LINKER='gcc'
+ MAKE=make
+
+ COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linux__ -fPIC -pipe"
+ INCLUDE_FLAG="-include"
+
+ 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
diff -udNr DarwinStreamingSrvr5.5.5-Source-orig/CommonUtilitiesLib/OSHeaders.h DarwinStreamingSrvr5.5.5-Source/CommonUtilitiesLib/OSHeaders.h
--- DarwinStreamingSrvr5.5.5-Source-orig/CommonUtilitiesLib/OSHeaders.h 2007-11-02 20:18:20.000000000 +0100
+++ DarwinStreamingSrvr5.5.5-Source/CommonUtilitiesLib/OSHeaders.h 2007-11-02 20:16:55.000000000 +0100
@@ -67,7 +67,7 @@
#define QT_PATH_SEPARATOR '/'
/* Typedefs */
- typedef unsigned int PointerSizedInt;
+ // typedef unsigned int PointerSizedInt;
typedef unsigned char UInt8;
typedef signed char SInt8;
typedef unsigned short UInt16;
@@ -76,6 +76,11 @@
typedef signed long SInt32;
typedef signed long long SInt64;
typedef unsigned long long UInt64;
+#ifndef __LP64__
+ typedef SInt32 PointerSizedInt;
+#else
+ typedef SInt64 PointerSizedInt;
+#endif
typedef float Float32;
typedef double Float64;
typedef UInt16 Bool16;
diff -udNr DarwinStreamingSrvr5.5.5-Source-orig/MP3Broadcaster/BroadcasterMain.cpp DarwinStreamingSrvr5.5.5-Source/MP3Broadcaster/BroadcasterMain.cpp
--- DarwinStreamingSrvr5.5.5-Source-orig/MP3Broadcaster/BroadcasterMain.cpp 2007-11-02 20:18:20.000000000 +0100
+++ DarwinStreamingSrvr5.5.5-Source/MP3Broadcaster/BroadcasterMain.cpp 2007-11-02 20:16:55.000000000 +0100
@@ -216,7 +216,7 @@
struct sigaction act;
-#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__)
+#if defined(sun) || defined(i386) || defined(__LP64__) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__)
sigemptyset(&act.sa_mask);
act.sa_flags = 0;
act.sa_handler = (void(*)(int))&SignalEventHandler;
@@ -229,14 +229,24 @@
if ( ::signal(SIGTERM, SIG_IGN) != SIG_IGN)
{ // from kill...
if ( ::sigaction(SIGTERM, &act, NULL) != 0 )
- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+ {
+#ifndef __LP64__
+ qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+#else
+ qtss_printf( "- PlaylistBroadcaster: System error (%li).\n", (long)SIG_ERR );
+#endif
}
}
if ( ::signal(SIGINT, SIG_IGN) != SIG_IGN)
{ // ^C signal
if ( ::sigaction(SIGINT, &act, NULL) != 0 )
- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+ {
+#ifndef __LP64__
+ qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+#else
+ qtss_printf( "- PlaylistBroadcaster: System error (%li).\n", (long)SIG_ERR );
+#endif
}
}
@@ -244,7 +254,12 @@
if ( ::signal(SIGPIPE, SIG_IGN) != SIG_IGN)
{ // broken pipe probably from a failed RTSP session (the server went down?)
if ( ::sigaction(SIGPIPE, &act, NULL) != 0 )
- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+ {
+#ifndef __LP64__
+ qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+#else
+ qtss_printf( "- PlaylistBroadcaster: System error (%li).\n", (long)SIG_ERR );
+#endif
}
}
@@ -252,7 +267,12 @@
if ( ::signal(SIGHUP, SIG_IGN) != SIG_IGN)
{ // catch any SIGHUP
if ( ::sigaction(SIGHUP, &act, NULL) != 0)
- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+ {
+#ifndef __LP64__
+ qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+#else
+ qtss_printf( "- PlaylistBroadcaster: System error (%li).\n", (long)SIG_ERR );
+#endif
}
}
@@ -260,7 +280,12 @@
if ( ::signal(SIGALRM, SIG_IGN) != SIG_IGN)
{ // catch any SIGALRM
if ( ::sigaction(SIGALRM, &act, NULL) != 0)
- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+ {
+#ifndef __LP64__
+ qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+#else
+ qtss_printf( "- PlaylistBroadcaster: System error (%li).\n", (long)SIG_ERR );
+#endif
}
}
diff -udNr DarwinStreamingSrvr5.5.5-Source-orig/PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp DarwinStreamingSrvr5.5.5-Source/PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp
--- DarwinStreamingSrvr5.5.5-Source-orig/PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp 2007-11-02 20:18:20.000000000 +0100
+++ DarwinStreamingSrvr5.5.5-Source/PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp 2007-11-02 20:16:55.000000000 +0100
@@ -2077,7 +2077,7 @@
struct sigaction act;
-#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__powerpc__) || defined (__sgi_cc__) || defined(__osf__) || defined(__hpux__)
+#if defined(sun) || defined(i386) || defined(__LP64__) || defined(__LP64__) || defined(__MacOSX__) || defined(__powerpc__) || defined (__sgi_cc__) || defined(__osf__) || defined(__hpux__)
sigemptyset(&act.sa_mask);
act.sa_flags = 0;
act.sa_handler = (void(*)(int))&SignalEventHandler;
@@ -2094,14 +2094,24 @@
if ( ::signal(SIGTERM, SIG_IGN) != SIG_IGN)
{ // from kill...
if ( ::sigaction(SIGTERM, &act, NULL) != 0 )
- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+ {
+#ifndef __LP64__
+ qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+#else
+ qtss_printf( "- PlaylistBroadcaster: System error (%li).\n", (long)SIG_ERR );
+#endif
}
}
if ( ::signal(SIGINT, SIG_IGN) != SIG_IGN)
{ // ^C signal
if ( ::sigaction(SIGINT, &act, NULL) != 0 )
- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+ {
+#ifndef __LP64__
+ qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+#else
+ qtss_printf( "- PlaylistBroadcaster: System error (%li).\n", (long)SIG_ERR );
+#endif
}
}
@@ -2109,7 +2119,12 @@
if ( ::signal(SIGPIPE, SIG_IGN) != SIG_IGN)
{ // broken pipe probably from a failed RTSP session (the server went down?)
if ( ::sigaction(SIGPIPE, &act, NULL) != 0 )
- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+ {
+#ifndef __LP64__
+ qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+#else
+ qtss_printf( "- PlaylistBroadcaster: System error (%li).\n", (long)SIG_ERR );
+#endif
}
}
@@ -2117,7 +2132,12 @@
if ( ::signal(SIGHUP, SIG_IGN) != SIG_IGN)
{ // broken pipe probably from a failed RTSP session (the server went down?)
if ( ::sigaction(SIGHUP, &act, NULL) != 0)
- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+ {
+#ifndef __LP64__
+ qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR );
+#else
+ qtss_printf( "- PlaylistBroadcaster: System error (%li).\n", (long)SIG_ERR );
+#endif
}
}
diff -udNr DarwinStreamingSrvr5.5.5-Source-orig/QTFileTools/QTBroadcaster.tproj/QTBroadcaster.cpp DarwinStreamingSrvr5.5.5-Source/QTFileTools/QTBroadcaster.tproj/QTBroadcaster.cpp
--- DarwinStreamingSrvr5.5.5-Source-orig/QTFileTools/QTBroadcaster.tproj/QTBroadcaster.cpp 2007-11-02 20:18:20.000000000 +0100
+++ DarwinStreamingSrvr5.5.5-Source/QTFileTools/QTBroadcaster.tproj/QTBroadcaster.cpp 2007-11-02 20:16:55.000000000 +0100
@@ -201,7 +201,11 @@
// Send the packet.
memset(&sin, 0, sizeof(struct sockaddr_in));
sin.sin_family = AF_INET;
+#ifndef __LP64__
sin.sin_port = htons( (int) RTPFile->GetLastPacketTrack()->Cookie1 );
+#else
+ sin.sin_port = htons( (long) RTPFile->GetLastPacketTrack()->Cookie1 );
+#endif
sin.sin_addr.s_addr = inet_addr(IPAddress);
sendto(s, Packet, PacketLength, 0, (struct sockaddr *)&sin, sizeof(struct sockaddr));
}
diff -udNr DarwinStreamingSrvr5.5.5-Source-orig/Server.tproj/main.cpp DarwinStreamingSrvr5.5.5-Source/Server.tproj/main.cpp
--- DarwinStreamingSrvr5.5.5-Source-orig/Server.tproj/main.cpp 2007-11-02 20:18:20.000000000 +0100
+++ DarwinStreamingSrvr5.5.5-Source/Server.tproj/main.cpp 2007-11-02 20:16:13.000000000 +0100
@@ -212,7 +212,7 @@
//(void) ::signal(SIGPIPE, SIG_IGN);
struct sigaction act;
-#if defined(sun) || defined(i386) || defined (__MacOSX__) || defined(__powerpc__) || defined (__osf__) || defined (__sgi_cc__) || defined (__hpux__)
+#if defined(sun) || defined(i386) || defined(__LP64__) || defined (__MacOSX__) || defined(__powerpc__) || defined (__osf__) || defined (__sgi_cc__) || defined (__hpux__)
sigemptyset(&act.sa_mask);
act.sa_flags = 0;
act.sa_handler = (void(*)(int))&sigcatcher;