small and probably dodgy fix

php.internals

Steph

21 years ago
Hi list, HEAD is broken for me following Derick's new sort flag addition earlier today. The attached one-liner may be a wrong fix, neither self nor D are sure. However it _does_ allow HEAD to build on my system! - Steph

Wez Furlong

21 years ago
If that fixes it, doesn't that imply that other systems without strcoll will also fail to build now? (are there any that we care about?) --Wez. On Mon, 13 Sep 2004 15:21:14 +0100, Steph <steph@zend.com> wrote:

Steph

21 years ago
no, there's only win32 and netware that have config files in the Zend dir. I put it in the wrong place, it needs to be just ahead of the string.h include: --- zend_config.w32.h Mon Sep 13 15:17:16 2004 +++ zend_config.w32.h Mon Sep 13 15:27:16 2004 @@ -30,6 +30,8 @@ #include <stdlib.h> #include <crtdbg.h> +#define HAVE_STRCOLL 1 + #include <string.h> #ifndef ZEND_INCLUDE_FULL_WINDOWS_HEADERS

Wez Furlong

21 years ago
I meant that, on linux for example, if you manually undefined HAVE_STRCOLL (to simulate not having it), will the build break? If so, then we need a real fix :-) --Wez. On Mon, 13 Sep 2004 16:11:10 +0100, Steph <steph@zend.com> wrote:

Steph

21 years ago
It missed the _define_. So if there was #define HAVE_STRCOLL 0 it'd be ok, but without the #define it's not ok. I'm just testing that now in case I'm wrong, but I don't think I am.

Steph

21 years ago
hm ok I'm wrong - if you manually undefine HAVE_STRCOLL on doze it breaks the build. (see irc ;) However it's still the case that the win32 build needs the definition in the Zend config file, since win32 _does_ have strcoll but the main PHP win32 configuration file doesn't reach the hinterlands.

Derick Rethans

21 years ago
On Mon, 13 Sep 2004, Wez Furlong wrote:
> I meant that, on linux for example, if you manually undefined > HAVE_STRCOLL (to simulate not having it), will the build break? > > If so, then we need a real fix :-)
It shouldn't that's why I think this is a wrong fix. I copied the #if HAVE_STRCOLL from other places. Derick
-- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org

Steph

21 years ago
We had this discussion on irc already. The Zend files change is necessary for Windows. The other change I submitted prevents the problem of not being able to build PHP on systems where STRCOLL is not available. Submit!!!!!