| 1 | $OpenBSD$ |
|---|
| 2 | --- PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp.orig Tue May 6 01:29:00 2008 |
|---|
| 3 | +++ PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp Sat Jun 7 22:06:31 2008 |
|---|
| 4 | @@ -43,8 +43,10 @@ |
|---|
| 5 | |
|---|
| 6 | */ |
|---|
| 7 | |
|---|
| 8 | +#if __OpenBSD__ |
|---|
| 9 | + #include <sys/param.h> |
|---|
| 10 | +#endif |
|---|
| 11 | |
|---|
| 12 | - |
|---|
| 13 | #include <stdio.h> |
|---|
| 14 | #include <stdlib.h> |
|---|
| 15 | #include "SafeStdLib.h" |
|---|
| 16 | @@ -57,7 +59,7 @@ |
|---|
| 17 | #if defined (__solaris__) || defined (__osf__) || defined (__sgi__) || defined (__hpux__) |
|---|
| 18 | #include "daemon.h" |
|---|
| 19 | #else |
|---|
| 20 | - #ifndef __FreeBSD__ |
|---|
| 21 | + #if defined (__FreeBSD__) || defined (__OpenBSD__) |
|---|
| 22 | #include <sys/sysctl.h> |
|---|
| 23 | #endif |
|---|
| 24 | #endif |
|---|
| 25 | @@ -2099,14 +2101,14 @@ struct sigaction act; |
|---|
| 26 | if ( ::signal(SIGTERM, SIG_IGN) != SIG_IGN) |
|---|
| 27 | { // from kill... |
|---|
| 28 | if ( ::sigaction(SIGTERM, &act, NULL) != 0 ) |
|---|
| 29 | - { qtss_printf( "- PlaylistBroadcaster: System error (%"_SPOINTERSIZEARG_").\n", (PointerSizedInt)SIG_ERR ); |
|---|
| 30 | + { qtss_printf( "- PlaylistBroadcaster: System error (%_SPOINTERSIZEARG_).\n", (PointerSizedInt)SIG_ERR ); |
|---|
| 31 | } |
|---|
| 32 | } |
|---|
| 33 | |
|---|
| 34 | if ( ::signal(SIGINT, SIG_IGN) != SIG_IGN) |
|---|
| 35 | { // ^C signal |
|---|
| 36 | if ( ::sigaction(SIGINT, &act, NULL) != 0 ) |
|---|
| 37 | - { qtss_printf( "- PlaylistBroadcaster: System error (%"_SPOINTERSIZEARG_").\n", (PointerSizedInt)SIG_ERR ); |
|---|
| 38 | + { qtss_printf( "- PlaylistBroadcaster: System error (%_SPOINTERSIZEARG_).\n", (PointerSizedInt)SIG_ERR ); |
|---|
| 39 | } |
|---|
| 40 | |
|---|
| 41 | } |
|---|
| 42 | @@ -2114,7 +2116,7 @@ struct sigaction act; |
|---|
| 43 | if ( ::signal(SIGPIPE, SIG_IGN) != SIG_IGN) |
|---|
| 44 | { // broken pipe probably from a failed RTSP session (the server went down?) |
|---|
| 45 | if ( ::sigaction(SIGPIPE, &act, NULL) != 0 ) |
|---|
| 46 | - { qtss_printf( "- PlaylistBroadcaster: System error (%"_SPOINTERSIZEARG_").\n", (PointerSizedInt)SIG_ERR ); |
|---|
| 47 | + { qtss_printf( "- PlaylistBroadcaster: System error (%_SPOINTERSIZEARG_).\n", (PointerSizedInt)SIG_ERR ); |
|---|
| 48 | } |
|---|
| 49 | |
|---|
| 50 | } |
|---|
| 51 | @@ -2122,7 +2124,7 @@ struct sigaction act; |
|---|
| 52 | if ( ::signal(SIGHUP, SIG_IGN) != SIG_IGN) |
|---|
| 53 | { // broken pipe probably from a failed RTSP session (the server went down?) |
|---|
| 54 | if ( ::sigaction(SIGHUP, &act, NULL) != 0) |
|---|
| 55 | - { qtss_printf( "- PlaylistBroadcaster: System error (%"_SPOINTERSIZEARG_").\n", (PointerSizedInt)SIG_ERR ); |
|---|
| 56 | + { qtss_printf( "- PlaylistBroadcaster: System error (%_SPOINTERSIZEARG_).\n", (PointerSizedInt)SIG_ERR ); |
|---|
| 57 | } |
|---|
| 58 | |
|---|
| 59 | } |
|---|