felipe                                   Fri, 27 May 2011 23:31:30 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=311517

Log:
- Fixed bug #54934 (Unresolved symbol strtoull in HP-UX 11.11)

Bug: http://bugs.php.net/54934 (Open) Unresolved symbol strtoull
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/apprentice.c
    U   php/php-src/branches/PHP_5_4/ext/fileinfo/libmagic/apprentice.c
    U   php/php-src/trunk/ext/fileinfo/libmagic/apprentice.c

Modified: php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/apprentice.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/apprentice.c     
2011-05-27 23:07:55 UTC (rev 311516)
+++ php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/apprentice.c     
2011-05-27 23:31:30 UTC (rev 311517)
@@ -41,6 +41,14 @@
 #include "patchlevel.h"
 #include <stdlib.h>

+#if defined(__hpux) && !defined(HAVE_STRTOULL)
+#if SIZEOF_LONG == 8
+# define strtoull strtoul
+#else
+# define strtoull __strtoull
+#endif
+#endif
+
 #ifdef PHP_WIN32
 #include "win32/unistd.h"
 #if _MSC_VER <= 1300

Modified: php/php-src/branches/PHP_5_4/ext/fileinfo/libmagic/apprentice.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/fileinfo/libmagic/apprentice.c     
2011-05-27 23:07:55 UTC (rev 311516)
+++ php/php-src/branches/PHP_5_4/ext/fileinfo/libmagic/apprentice.c     
2011-05-27 23:31:30 UTC (rev 311517)
@@ -41,6 +41,14 @@
 #include "patchlevel.h"
 #include <stdlib.h>

+#if defined(__hpux) && !defined(HAVE_STRTOULL)
+#if SIZEOF_LONG == 8
+# define strtoull strtoul
+#else
+# define strtoull __strtoull
+#endif
+#endif
+
 #ifdef PHP_WIN32
 #include "win32/unistd.h"
 #if _MSC_VER <= 1300

Modified: php/php-src/trunk/ext/fileinfo/libmagic/apprentice.c
===================================================================
--- php/php-src/trunk/ext/fileinfo/libmagic/apprentice.c        2011-05-27 
23:07:55 UTC (rev 311516)
+++ php/php-src/trunk/ext/fileinfo/libmagic/apprentice.c        2011-05-27 
23:31:30 UTC (rev 311517)
@@ -41,6 +41,14 @@
 #include "patchlevel.h"
 #include <stdlib.h>

+#if defined(__hpux) && !defined(HAVE_STRTOULL)
+#if SIZEOF_LONG == 8
+# define strtoull strtoul
+#else
+# define strtoull __strtoull
+#endif
+#endif
+
 #ifdef PHP_WIN32
 #include "win32/unistd.h"
 #if _MSC_VER <= 1300

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to