diff options
| author | cweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f> | 2009-11-04 21:34:08 +0000 |
|---|---|---|
| committer | cweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f> | 2009-11-04 21:34:08 +0000 |
| commit | bfaa111fa1aaf39485bd50f0141373dcb6798bef (patch) | |
| tree | b792cf4d7575554f0407e0faf73fc4e93cfa00ac | |
| parent | 1b11e826fb0358610a9ab12c0d3278e200f5c599 (diff) | |
| download | semanticscuttle-bfaa111fa1aaf39485bd50f0141373dcb6798bef.tar.gz semanticscuttle-bfaa111fa1aaf39485bd50f0141373dcb6798bef.tar.bz2 | |
fix php-gettext on 64 bit
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@514 b3834d28-1941-0410-a4f8-b48e95affb8f
| -rw-r--r-- | src/php-gettext/ChangeLog | 8 | ||||
| -rw-r--r-- | src/php-gettext/gettext.php | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/php-gettext/ChangeLog b/src/php-gettext/ChangeLog index 5e0949d..31e782e 100644 --- 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 ad94a98..978794c 100644 --- 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 |