Assembla home | Assembla project page
 

Changeset 69

Show
Ignore:
Timestamp:
05/24/08 06:59:11 (8 months ago)
Author:
andreasf
Message:

Prettified patch, as suggested by Scott.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • BePorts/trunk/net-misc/curl/curl-CVS.diff

    r68 r69  
    55diff -u -p -r1.283 configure.ac 
    66--- configure.ac        7 Apr 2008 09:26:31 -0000       1.283 
    7 +++ configure.ac        23 May 2008 17:19:22 -0000 
     7+++ configure.ac        24 May 2008 06:17:11 -0000 
    88@@ -540,6 +540,15 @@ fi 
    99  
    …… 
    2828diff -u -p -r1.50 select.c 
    2929--- lib/select.c        6 Mar 2008 03:48:34 -0000       1.50 
    30 +++ lib/select.c        23 May 2008 17:19:26 -0000 
    31 @@ -35,9 +35,14 @@ 
     30+++ lib/select.c        24 May 2008 06:17:15 -0000 
     31@@ -34,7 +34,7 @@ 
     32 #error "We can't compile without select() or poll() support." 
    3233 #endif 
    3334  
    34  #ifdef __BEOS__ 
    35 +#ifdef __HAIKU__ 
    36 +/* Haiku has FD_SET defined in sys/socket.h and no socket.h */ 
    37 +#include <sys/socket.h> 
    38 +#else 
     35-#ifdef __BEOS__ 
     36+#if defined(__BEOS__) && !defined(__HAIKU__) 
    3937 /* BeOS has FD_SET defined in socket.h */ 
    4038 #include <socket.h> 
    4139 #endif 
    42 +#endif 
    43   
    44  #ifdef MSDOS 
    45  #include <dos.h>  /* delay() */