fix php-gettext on 64 bit

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@514 b3834d28-1941-0410-a4f8-b48e95affb8f

diff --git a/src/php-gettext/ChangeLog b/src/php-gettext/ChangeLog
index 5e0949dfd7557077f27016a0da7183de9932da57..31e782e58bab6326adade6e33c17bbc57121dba4 100644 (file)
--- a/src/php-gettext/ChangeLog
+++ b/src/php-gettext/ChangeLog
@@ -1,3 +1,11 @@
+---- semanticscuttle-specific -----
+2009-11-03 Christian Weiske <cweiske@cweiske.de>
+       * fix magic detection on 64 bit systems, apply patch from:
+         http://source.ibiblio.org/trac/lyceum/attachment/ticket/652/gettext-64bit-fix.diff
+
+
+---- version 1.07 -----
+
 2006-02-07  Danilo Šegan  <danilo@gnome.org>
 
        * examples/pigs_dropin.php: comment-out bind_textdomain_codeset

diff --git a/src/php-gettext/gettext.php b/src/php-gettext/gettext.php
index ad94a987b7e2e60cb71c321115108573bcf34e6a..978794c8d9dd4bfb5d88f90db74532b36a18790e 100644 (file)
--- a/src/php-gettext/gettext.php
+++ b/src/php-gettext/gettext.php
@@ -109,9 +109,9 @@ class gettext_reader {
 
     $this->STREAM = $Reader;
     $magic = $this->readint();
-    if ($magic == $MAGIC1) {
+    if ($magic == $MAGIC1 || $magic == ($MAGIC1 & 0xFFFFFFFF)) {
       $this->BYTEORDER = 0;
-    } elseif ($magic == $MAGIC2) {
+    } elseif ($magic == $MAGIC2 || $magic == ($MAGIC2 & 0xFFFFFFFF)) {
       $this->BYTEORDER = 1;
     } else {
       $this->error = 1; // not MO file