diff options
author | Peter Kokot <peterkokot@gmail.com> | 2019-07-12 02:57:52 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2019-07-13 01:58:01 +0200 |
commit | 33994ebd95c3c42b0dca4e0f161692ecee7d741b (patch) | |
tree | 594edbe8fa80f590a8de1d96242e34759cd1a142 /TSRM | |
parent | a6fa097cebcd13baf6e152afcdbc0d1d5ae98d51 (diff) | |
download | php-git-33994ebd95c3c42b0dca4e0f161692ecee7d741b.tar.gz |
Remove tsrm_config_common.h
- Checks and defines are not relevant for files that include it anymore
- Some code is not used anymore
- Defines are a bit duplicated in zend_portability.h and TSRM.h file
- MAXPATHLEN defs moved to zend_virtual_cwd.h
Diffstat (limited to 'TSRM')
-rw-r--r-- | TSRM/tsrm_config_common.h | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/TSRM/tsrm_config_common.h b/TSRM/tsrm_config_common.h deleted file mode 100644 index 90c2ea4b33..0000000000 --- a/TSRM/tsrm_config_common.h +++ /dev/null @@ -1,69 +0,0 @@ -#ifndef TSRM_CONFIG_COMMON_H -#define TSRM_CONFIG_COMMON_H - -#ifndef __CYGWIN__ -# ifdef _WIN32 -# define TSRM_WIN32 -# endif -#endif - -#ifdef TSRM_WIN32 -# include "Zend/zend_config.w32.h" -#else -# include "main/php_config.h" -# include <sys/param.h> -#endif - -#if HAVE_ALLOCA_H && !defined(_ALLOCA_H) -# include <alloca.h> -#endif - -/* AIX requires this to be the first thing in the file. */ -#ifndef __GNUC__ -# ifndef HAVE_ALLOCA_H -# ifdef _AIX -#pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -#endif - -#if HAVE_UNISTD_H -#include <unistd.h> -#endif - -#include <limits.h> - -#ifndef MAXPATHLEN -# if _WIN32 -# include "win32/ioutil.h" -# define MAXPATHLEN PHP_WIN32_IOUTIL_MAXPATHLEN -# elif PATH_MAX -# define MAXPATHLEN PATH_MAX -# elif defined(MAX_PATH) -# define MAXPATHLEN MAX_PATH -# else -# define MAXPATHLEN 256 -# endif -#endif - -#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) -# define TSRM_ALLOCA_MAX_SIZE 4096 -# define TSRM_ALLOCA_FLAG(name) \ - int name; -# define tsrm_do_alloca_ex(size, limit, use_heap) \ - ((use_heap = ((size) > (limit))) ? malloc(size) : alloca(size)) -# define tsrm_do_alloca(size, use_heap) \ - tsrm_do_alloca_ex(size, TSRM_ALLOCA_MAX_SIZE, use_heap) -# define tsrm_free_alloca(p, use_heap) \ - do { if (use_heap) free(p); } while (0) -#else -# define TSRM_ALLOCA_FLAG(name) -# define tsrm_do_alloca(p, use_heap) malloc(p) -# define tsrm_free_alloca(p, use_heap) free(p) -#endif - -#endif /* TSRM_CONFIG_COMMON_H */ |