Same problem exists in the branch, so please merge this fix. Edin
----- Original Message ----- From: "Wez Furlong" <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Sent: Thursday, November 14, 2002 1:06 PM Subject: [PHP-CVS] cvs: php4 /ext/mbstring mbstring.h > wez Thu Nov 14 07:06:02 2002 EDT > > Modified files: > /php4/ext/mbstring mbstring.h > Log: > Fix build for unix. > Not sure if this needs merging to the branch (haven't got that far yet today). > > > Index: php4/ext/mbstring/mbstring.h > diff -u php4/ext/mbstring/mbstring.h:1.41 php4/ext/mbstring/mbstring.h:1.42 > --- php4/ext/mbstring/mbstring.h:1.41 Wed Nov 13 18:11:14 2002 > +++ php4/ext/mbstring/mbstring.h Thu Nov 14 07:06:01 2002 > @@ -16,7 +16,7 @@ > +------------------------------------------------------------------- ---+ > */ > > -/* $Id: mbstring.h,v 1.41 2002/11/13 23:11:14 edink Exp $ */ > +/* $Id: mbstring.h,v 1.42 2002/11/14 12:06:01 wez Exp $ */ > > /* > * PHP4 Multibyte String module "mbstring" (currently only for Japanese) > @@ -49,18 +49,18 @@ > #ifdef COMPILE_DL_MBSTRING > #undef HAVE_MBSTRING > #define HAVE_MBSTRING 1 > -#undef MBSTRING_API > -#define MBSTRING_API > - > #endif > > #ifdef PHP_WIN32 > -#undef MBSTRING_API > -#ifdef MBSTRING_EXPORTS > -#define MBSTRING_API __declspec(dllexport) > +# undef MBSTRING_API > +# ifdef MBSTRING_EXPORTS > +# define MBSTRING_API __declspec(dllexport) > +# else > +# define MBSTRING_API __declspec(dllimport) > +# endif > #else > -#define MBSTRING_API __declspec(dllimport) > -#endif > +# undef MBSTRING_API > +# define MBSTRING_API /* nothing special */ > #endif > > > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
