mirror of
https://github.com/php/php-src.git
synced 2025-08-15 13:38:49 +02:00
11accb5cdf
* Include from build dir first
This fixes out of tree builds by ensuring that configure artifacts are included
from the build dir.
Before, out of tree builds would preferably include files from the src dir, as
the include path was defined as follows (ignoring includes from ext/ and sapi/) :
-I$(top_builddir)/main
-I$(top_srcdir)
-I$(top_builddir)/TSRM
-I$(top_builddir)/Zend
-I$(top_srcdir)/main
-I$(top_srcdir)/Zend
-I$(top_srcdir)/TSRM
-I$(top_builddir)/
As a result, an out of tree build would include configure artifacts such as
`main/php_config.h` from the src dir.
After this change, the include path is defined as follows:
-I$(top_builddir)/main
-I$(top_builddir)
-I$(top_srcdir)/main
-I$(top_srcdir)
-I$(top_builddir)/TSRM
-I$(top_builddir)/Zend
-I$(top_srcdir)/Zend
-I$(top_srcdir)/TSRM
* Fix extension include path for out of tree builds
* Include config.h with the brackets form
`#include "config.h"` searches in the directory containing the including-file
before any other include path. This can include the wrong config.h when building
out of tree and a config.h exists in the source tree.
Using `#include <config.h>` uses exclusively the include path, and gives
priority to the build dir.
61 lines
1.8 KiB
C
61 lines
1.8 KiB
C
/*
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| https://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
| Authors: Stanislav Malyshev <stas@zend.com> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include <config.h>
|
|
#endif
|
|
|
|
#include "formatter_data.h"
|
|
|
|
/* {{{ void formatter_data_init( formatter_data* nf_data )
|
|
* Initialize internals of formatter_data.
|
|
*/
|
|
void formatter_data_init( formatter_data* nf_data )
|
|
{
|
|
if( !nf_data )
|
|
return;
|
|
|
|
nf_data->unum = NULL;
|
|
intl_error_reset( &nf_data->error );
|
|
}
|
|
/* }}} */
|
|
|
|
/* {{{ void formatter_data_free( formatter_data* nf_data )
|
|
* Clean up mem allocted by internals of formatter_data
|
|
*/
|
|
void formatter_data_free( formatter_data* nf_data )
|
|
{
|
|
if( !nf_data )
|
|
return;
|
|
|
|
if( nf_data->unum )
|
|
unum_close( nf_data->unum );
|
|
|
|
nf_data->unum = NULL;
|
|
intl_error_reset( &nf_data->error );
|
|
}
|
|
/* }}} */
|
|
|
|
/* {{{ formatter_data* formatter_data_create()
|
|
* Alloc mem for formatter_data and initialize it with default values.
|
|
*/
|
|
formatter_data* formatter_data_create( void )
|
|
{
|
|
formatter_data* nf_data = ecalloc( 1, sizeof(formatter_data) );
|
|
|
|
formatter_data_init( nf_data );
|
|
|
|
return nf_data;
|
|
}
|
|
/* }}} */
|