Re: cvs: php-src /ext/ming config.m4 ming.c
| From: | Marcus Boerger | Date: | Fri, 03 Nov 2006 20:02:53 +0000 |
| Subject: | Re: cvs: php-src /ext/ming config.m4 ming.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-41335@lists.php.net to get a copy of this message | ||
Hello Frank,
if the fix is that easy then just go ahead :-)
best regards
marcus
Friday, November 3, 2006, 8:53:21 PM, you wrote:
> Helle All,
> What problem are you trying to solve here. This fix will break the windows
> buld and can be solved by adding the missing headers to ming.h in the nxt
> release (where they should be in the first place).
> - Frank
>> helly Fri Nov 3 18:57:36 2006 UTC
>>
>> Modified files:
>> /php-src/ext/ming config.m4 ming.c
>> Log:
>> - Include new headers only if present
>>
>>
>
> http://cvs.php.net/viewvc.cgi/php-src/ext/ming/config.m4?r1=1.26&r2=1.27&diff_format=u
>> Index: php-src/ext/ming/config.m4
>> diff -u php-src/ext/ming/config.m4:1.26 php-src/ext/ming/config.m4:1.27
>> --- php-src/ext/ming/config.m4:1.26 Wed Dec 21 21:43:25 2005
>> +++ php-src/ext/ming/config.m4 Fri Nov 3 18:57:36 2006
>> @@ -1,5 +1,5 @@
>> dnl
>> -dnl $Id: config.m4,v 1.26 2005/12/21 21:43:25 sniper Exp $
>> +dnl $Id: config.m4,v 1.27 2006/11/03 18:57:36 helly Exp $
>> dnl
>>
>> PHP_ARG_WITH(ming, for MING support,
>> @@ -84,6 +84,9 @@
>> ], [])
>> CPPFLAGS=$old_CPPFLAGS
>>
>> + AC_CHECK_HEADERS([ming/displaylist.h])
>> + AC_CHECK_HEADERS([ming/movie.h])
>> +
>> PHP_NEW_EXTENSION(ming, ming.c, $ext_shared)
>> PHP_SUBST(MING_SHARED_LIBADD)
>> fi
>>
>
> http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.87&r2=1.88&diff_format=uPoFqlíW
> �p0@y'©
>> Index: php-src/ext/ming/ming.c
>> diff -u php-src/ext/ming/ming.c:1.87 php-src/ext/ming/ming.c:1.88
>> --- php-src/ext/ming/ming.c:1.87 Fri Nov 3 14:06:33 2006
>> +++ php-src/ext/ming/ming.c Fri Nov 3 18:57:36 2006
>> @@ -17,7 +17,7 @@
>>
> +----------------------------------------------------------------------+
>> */
>>
>> -/* $Id: ming.c,v 1.87 2006/11/03 14:06:33 bjori Exp $ */
>> +/* $Id: ming.c,v 1.88 2006/11/03 18:57:36 helly Exp $ */
>>
>> #ifdef HAVE_CONFIG_H
>> #include "config.h"
>> @@ -36,8 +36,12 @@
>> #include <stdio.h>
>> #include <math.h>
>> #include <ming.h>
>> -#include <ming/displaylist.h>
>> -#include <ming/movie.h>
>> +#ifdef HAVE_MING_DISPLAYLIST_H
>> +# include <ming/displaylist.h>
>> +#endif
>> +#ifdef HAVE_MING_MOVIE_H
>> +# include <ming/movie.h>
>> +#endif
>>
>> #define FLOAT_Z_DVAL_PP(x) ((float)Z_DVAL_PP(x))
>> #define BYTE_Z_LVAL_PP(x) ((byte)Z_LVAL_PP(x))
>>
>> --
>> PHP CVS Mailing List (http://www.php.net/)
>> To unsubscribe, visit: http://www.php.net/unsub.php
>>
Best regards,
Marcus