summaryrefslogtreecommitdiff
path: root/ext/intl/timezone/timezone_methods.cpp
diff options
context:
space:
mode:
authorGustavo André dos Santos Lopes <cataphract@php.net>2012-06-25 10:59:58 +0200
committerGustavo André dos Santos Lopes <cataphract@php.net>2012-06-25 10:59:58 +0200
commit9c5074a484b7f10e65471a21a7ef50dda8391509 (patch)
tree3f106a51663d8abca754f1dc77716e36b76116f7 /ext/intl/timezone/timezone_methods.cpp
parentee8b9d5c6f7390a56b277b170e2e3baee5c74bf4 (diff)
downloadphp-git-9c5074a484b7f10e65471a21a7ef50dda8391509.tar.gz
Fix undeclared intl_locale_get_default()
This was causing segfaults at least in the resourcebundle constructor. Also moved intl_locale_get_default() to a more central location and fixed a constness warning in resourcebundle_ctor().
Diffstat (limited to 'ext/intl/timezone/timezone_methods.cpp')
-rw-r--r--ext/intl/timezone/timezone_methods.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/intl/timezone/timezone_methods.cpp b/ext/intl/timezone/timezone_methods.cpp
index 1435679fe7..caf5dcdedc 100644
--- a/ext/intl/timezone/timezone_methods.cpp
+++ b/ext/intl/timezone/timezone_methods.cpp
@@ -25,10 +25,10 @@
#include <unicode/ustring.h>
#include "intl_convertcpp.h"
extern "C" {
+#include "../php_intl.h"
#define USE_TIMEZONE_POINTER 1
#include "timezone_class.h"
#include "intl_convert.h"
-#include "../locale/locale.h"
#include <zend_exceptions.h>
#include <ext/date/php_date.h>
}