[FFmpeg-devel] [PATCH] fix post r9988 Cygwin builds

[Ramiro Polla]

M?ns Rullg?rd wrote:
> Ramiro Polla <ramiro at lisha.ufsc.br> writes:
>
>   
>> M?ns Rullg?rd wrote:
>>     
>>> Ramiro Polla <ramiro at lisha.ufsc.br> writes:
>>>
>>>
>>>       
>>>> M?ns Rullg?rd wrote:
>>>>
>>>>         
>>>>> Ramiro Polla <ramiro at lisha.ufsc.br> writes:
>>>>>
>>>>>           
>>>>>> Two patches attached.
>>>>>>
>>>>>> Ramiro Polla
>>>>>> Index: configure
>>>>>> ===================================================================
>>>>>> --- configure	(revision 10072)
>>>>>> +++ configure	(working copy)
>>>>>> @@ -1537,7 +1537,7 @@
>>>>>>  check_header termios.h
>>>>>>  check_header conio.h
>>>>>>
>>>>>> -check_header arpa/inet.h
>>>>>> +check_header arpa/inet.h ||
>>>>>>  check_header winsock2.h
>>>>>>
>>>>>>             
>>>>> Why the || ?
>>>>>
>>>>>           
>>>> This is the fix for Cygwin, which has both arpa/inet.h and
>>>> winsock2.h. It can't use both.
>>>>         
>>> Shouldn't some ifdeffery in the code take care of that?
>>>       
>> Are you seriously suggesting that you'd prefer ifdeffery? You'll be
>> contradicting yourself if you do. Just in case you really want to
>> consider it, attached is ifdeffery.diff
>>     
>
> I would have thought something like this would do it:
>
> #ifdef HAVE_ARPA_INET_H
> /* standard network stuff */
> #elif defined HAVE_WINSOCK2_H
> /* winsock stuff */
> #else
> /* no network stuff, if needed */
> #endif
>
>   

os_support_network.diff moves the CONFIG_NETWORK #ifdef to have effect 
over the whole file, since everything on os_support.c depends on 
network. It is needed for the next patch to work, since network.h must 
be included before winsock is checked for.

use_winsock2.diff makes network.h check if winsock2 is to be used.

Ramiro Polla
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: os_support_network.diff
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20070811/f3b8d39c/attachment.asc>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: use_winsock2.diff
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20070811/f3b8d39c/attachment.txt>