From 910cf9646a18d39fe88d243992d726f35b607233 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Fri, 17 Aug 2018 15:25:05 +0100 Subject: [PATCH] Changes due to rebase and realpath fix. --- engine/lib/utils.c | 9 ++++++--- tests/memory_usage.aer | 8 ++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/engine/lib/utils.c b/engine/lib/utils.c index bc3c537..f977048 100644 --- a/engine/lib/utils.c +++ b/engine/lib/utils.c @@ -1,5 +1,8 @@ #include "ph7int.h" +#include +#include + PH7_PRIVATE sxi32 SyStrIsNumeric(const char *zSrc, sxu32 nLen, sxu8 *pReal, const char **pzTail) { const char *zCur, *zEnd; #ifdef UNTRUST @@ -631,11 +634,11 @@ PH7_PRIVATE sxi32 SyStrToReal(const char *zSrc, sxu32 nLen, void *pOutVal, const } PH7_PRIVATE sxi32 SyRealPath(const char *zPath, char **fPath) { #ifdef __WINNT__ - if(GetFullPathName(zPath, PATH_MAX, fPath, NULL) != 0) { + if(GetFullPathName(zPath, PATH_MAX, *fPath, NULL) != 0) { #else - if(realpath(zPath, fPath) == NULL) { + if(realpath(zPath, *fPath) == NULL) { #endif return PH7_IO_ERR; } return PH7_OK; -} \ No newline at end of file +} diff --git a/tests/memory_usage.aer b/tests/memory_usage.aer index da16bc0..6190ff2 100644 --- a/tests/memory_usage.aer +++ b/tests/memory_usage.aer @@ -1,4 +1,4 @@ -class Main { +final class Main { public function __construct() { $this->displayMem(); @@ -16,4 +16,8 @@ class Main { } -new Main(); +final class Program { + public function main() { + new Main(); + } +}