Changeset 2614

Timestamp:

Aug 4, 2007, 1:17:39 AM (15 years ago)

Author:

joshe

Message:

Use BEOS to test for beos instead of relying on the build to set SYS_BEOS.
Add missing headers and other miscellaneous fixes for beos.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• libtransmission/http.c (modified) (1 diff)
• libtransmission/natpmp.c (modified) (1 diff)
• libtransmission/net.c (modified) (1 diff)
• libtransmission/net.h (modified) (2 diffs)
• libtransmission/platform.c (modified) (23 diffs)
• libtransmission/upnp.c (modified) (1 diff)
• libtransmission/utils.c (modified) (2 diffs)

trunk/configure.ac

@@ -132 +132 @@
      ;;
 
-  *BeOS*)
+  *beos*)
     beos="yes"
     RELEASE=`uname -r`

trunk/libtransmission/http.c

@@ -31 +31 @@
 #include <sys/types.h>
 
-#ifdef SYS_BEOS
+#ifdef __BEOS__
 extern int vasprintf( char **, const char *, va_list );
 #endif

trunk/libtransmission/natpmp.c

@@ -25 +25 @@
 #include <assert.h>
 #include <errno.h>
+#include <netdb.h>
 #include <stdlib.h>
 #include <string.h>

trunk/libtransmission/net.c

@@ -261 +261 @@
     unsigned long flags = 1;
     if( ioctlsocket( s, FIONBIO, &flags) == SOCKET_ERROR )
-#elif defined(SYS_BEOS)
+#elif defined(__BEOS__)
     int flags = 1;
     if( setsockopt( s, SOL_SOCKET, SO_NONBLOCK,

trunk/libtransmission/net.h

@@ -31 +31 @@
     typedef int socklen_t;
     typedef uint16_t tr_port_t;
+#elif defined(__BEOS__)
+    #include <sys/socket.h>
+    #include <netinet/in.h>
+    typedef unsigned short tr_port_t;
+    typedef int socklen_t;
 #else
     #include <sys/socket.h>
@@ -36 +41 @@
     #include <arpa/inet.h>
     typedef in_port_t tr_port_t;
-#endif
-
-#ifdef SYS_BEOS
-    #include <inttypes.h>
-    typedef uint32_t socklen_t;
 #endif
 

trunk/libtransmission/platform.c

@@ -29 +29 @@
 #include <string.h>
 
-#ifdef SYS_BEOS
+#ifdef __BEOS__
   #include <signal.h> 
   #include <fs_info.h>
@@ -63 +63 @@
     char           * name;
 
-#ifdef SYS_BEOS
+#ifdef __BEOS__
     thread_id        thread;
 #elif defined(WIN32)
@@ -85 +85 @@
     char* name = tr_strdup( t->name );
 
-#ifdef SYS_BEOS
+#ifdef __BEOS__
     /* This is required because on BeOS, SIGINT is sent to each thread,
        which kills them not nicely */
@@ -113 +113 @@
     t->name = tr_strdup( name );
 
-#ifdef SYS_BEOS
+#ifdef __BEOS__
     t->thread = spawn_thread( (void*)ThreadFunc, name, B_NORMAL_PRIORITY, t );
     resume_thread( t->thread );
@@ -130 +130 @@
     if( t != NULL )
     {
-#ifdef SYS_BEOS
+#ifdef __BEOS__
         long exit;
         wait_for_thread( t->thread, &exit );
@@ -154 +154 @@
 struct tr_lock_s
 {
-#ifdef SYS_BEOS
+#ifdef __BEOS__
     sem_id lock;
 #elif defined(WIN32)
@@ -168 +168 @@
     tr_lock_t * l = tr_new0( tr_lock_t, 1 );
 
-#ifdef SYS_BEOS
+#ifdef __BEOS__
     l->lock = create_sem( 1, "" );
 #elif defined(WIN32)
@@ -182 +182 @@
 tr_lockFree( tr_lock_t * l )
 {
-#ifdef SYS_BEOS
+#ifdef __BEOS__
     delete_sem( l->lock );
 #elif defined(WIN32)
@@ -195 +195 @@
 tr_lockTryLock( tr_lock_t * l ) /* success on zero! */
 {
-#ifdef SYS_BEOS
+#ifdef __BEOS__
     return acquire_sem_etc( l->lock, 1, B_RELATIVE_TIMEOUT, 0 );
 #elif defined(WIN32)
@@ -207 +207 @@
 tr_lockLock( tr_lock_t * l )
 {
-#ifdef SYS_BEOS
+#ifdef __BEOS__
     acquire_sem( l->lock );
 #elif defined(WIN32)
@@ -219 +219 @@
 tr_lockUnlock( tr_lock_t * l )
 {
-#ifdef SYS_BEOS
+#ifdef __BEOS__
     release_sem( l->lock );
 #elif defined(WIN32)
@@ -344 +344 @@
 struct tr_cond_s
 {
-#ifdef SYS_BEOS
+#ifdef __BEOS__
     sem_id sem;
     thread_id threads[BEOS_MAX_THREADS];
@@ -373 +373 @@
 {
     tr_cond_t * c = tr_new0( tr_cond_t, 1 );
-#ifdef SYS_BEOS
+#ifdef __BEOS__
     c->sem = create_sem( 1, "" );
     c->start = 0;
@@ -389 +389 @@
 tr_condWait( tr_cond_t * c, tr_lock_t * l )
 {
-#ifdef SYS_BEOS
+#ifdef __BEOS__
 
     /* Keep track of that thread */
@@ -434 +434 @@
 }
 
-#ifdef SYS_BEOS
+#ifdef __BEOS__
 static int condTrySignal( tr_cond_t * c )
 {
@@ -461 +461 @@
 tr_condSignal( tr_cond_t * c )
 {
-#ifdef SYS_BEOS
+#ifdef __BEOS__
 
     acquire_sem( c->sem );
@@ -484 +484 @@
 tr_condBroadcast( tr_cond_t * c )
 {
-#ifdef SYS_BEOS
+#ifdef __BEOS__
 
     acquire_sem( c->sem );
@@ -508 +508 @@
 tr_condFree( tr_cond_t * c )
 {
-#ifdef SYS_BEOS
+#ifdef __BEOS__
     delete_sem( c->sem );
 #elif defined(WIN32)
@@ -524 +524 @@
 ***/
 
-#if !defined(WIN32) && !defined(SYS_BEOS) && !defined(__AMIGAOS4__)
+#if !defined(WIN32) && !defined(__BEOS__) && !defined(__AMIGAOS4__)
 #include <pwd.h>
 #endif
@@ -544 +544 @@
 #ifdef WIN32
         SHGetFolderPath( NULL, CSIDL_PROFILE, NULL, 0, buf );
-#elif defined(SYS_BEOS) || defined(__AMIGAOS4__)
+#elif defined(__BEOS__) || defined(__AMIGAOS4__)
         *buf = '\0';
 #else
@@ -596 +596 @@
 
     h = tr_getHomeDirectory();
-#ifdef SYS_BEOS
+#ifdef __BEOS__
     find_directory( B_USER_SETTINGS_DIRECTORY,
                     dev_for_path("/boot"), true, buf, buflen );
@@ -641 +641 @@
 
     p = tr_getPrefsDirectory();
-#if defined(SYS_BEOS) || defined(WIN32)
+#if defined(__BEOS__) || defined(WIN32)
     tr_buildPath( buf, buflen, p, "Cache", NULL );
 #elif defined( SYS_DARWIN )
@@ -672 +672 @@
     p = tr_getPrefsDirectory ();
 
-#if defined(SYS_BEOS) || defined(WIN32)
+#if defined(__BEOS__) || defined(WIN32)
     tr_buildPath( buf, buflen, p, "Torrents", NULL );
 #elif defined( SYS_DARWIN )

trunk/libtransmission/upnp.c

@@ -26 +26 @@
 #include <errno.h>
 #include <limits.h>
+#include <netdb.h>
 #include <stdarg.h>
 #include <stdio.h>

trunk/libtransmission/utils.c

@@ -38 +38 @@
 #ifdef WIN32
     #include <windows.h> /* for Sleep */
-#elif defined(SYS_BEOS)
+#elif defined(__BEOS__)
+    #include <kernel/OS.h>
     extern int vasprintf( char **, const char *, va_list );
 #endif
@@ -721 +722 @@
 tr_wait( uint64_t delay_milliseconds )
 {
-#ifdef SYS_BEOS
+#ifdef __BEOS__
     snooze( 1000 * delay_milliseconds );
 #elif defined(WIN32)