Commit:    99e48d3a5751b486fdc49a3409edd509faa3b27c
Author:    Gustavo André dos Santos Lopes <cataphr...@php.net>         Sun, 22 
Jul 2012 04:22:48 +0200
Parents:   11a5afec22e62af1555ceedc41460b96f8c06ed5 
2498c90c71980168b5b9ac2fa006340b9460b1f2
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=99e48d3a5751b486fdc49a3409edd509faa3b27c

Log:
Merge branch 'datefmt_tz_cal_interop'

* datefmt_tz_cal_interop:
  Readded accidentally removed line
  Added IntlDateFormatter::formatObject(). Refactor
  Refactored internal_get_timestamp()
  Unified zval -> UDate conversions

Changed paths:
  MM  ext/intl/calendar/calendar_methods.cpp
  MM  ext/intl/config.m4
  MM  ext/intl/config.w32
  MM  ext/intl/dateformat/dateformat_class.c
  MM  ext/intl/php_intl.c
  MM  ext/intl/timezone/timezone_methods.cpp


Diff:
diff --cc ext/intl/calendar/calendar_methods.cpp
index 539b11a,f59edaa..f2758fd
--- a/ext/intl/calendar/calendar_methods.cpp
+++ b/ext/intl/calendar/calendar_methods.cpp
@@@ -23,9 -23,11 +23,12 @@@
  #include <unicode/locid.h>
  #include <unicode/calendar.h>
  #include <unicode/ustring.h>
+ 
  #include "../intl_convertcpp.h"
+ #include "../common/common_date.h"
+ 
  extern "C" {
 +#include "../php_intl.h"
  #define USE_TIMEZONE_POINTER 1
  #include "../timezone/timezone_class.h"
  #define USE_CALENDAR_POINTER 1
diff --cc ext/intl/timezone/timezone_methods.cpp
index caf5dcd,c35f0b8..9ca6b44
--- a/ext/intl/timezone/timezone_methods.cpp
+++ b/ext/intl/timezone/timezone_methods.cpp
@@@ -24,8 -24,10 +24,11 @@@
  #include <unicode/timezone.h>
  #include <unicode/ustring.h>
  #include "intl_convertcpp.h"
+ 
+ #include "../common/common_date.h"
+ 
  extern "C" {
 +#include "../php_intl.h"
  #define USE_TIMEZONE_POINTER 1
  #include "timezone_class.h"
  #include "intl_convert.h"


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

Reply via email to