caiyu/gmio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: rename GMIO_HAVE_WIN_ALLOCA_FUNC to GMIO_HAVE_WIN__ALLOCA_FUNC

Browse Source
This commit is contained in:
Hugues Delorme 2015-04-01 15:43:03 +02:00
parent c0db993f05
commit 6df6299036
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -62,7 +62,7 @@ if(WIN32)
check_function_exists(_fstat64 GMIO_HAVE_WIN__FSTAT64_FUNC) check_function_exists(_fstat64 GMIO_HAVE_WIN__FSTAT64_FUNC)
endif() endif()
# Find available C99 and compiler/OS specific features # Check available C99 and compiler/OS specific features
if(NOT BUILD_STRICT_C90) if(NOT BUILD_STRICT_C90)
check_function_exists(strtof GMIO_HAVE_STRTOF_FUNC) check_function_exists(strtof GMIO_HAVE_STRTOF_FUNC)
check_function_exists(powf GMIO_HAVE_POWF_FUNC) check_function_exists(powf GMIO_HAVE_POWF_FUNC)
@ -79,7 +79,7 @@ if(NOT BUILD_STRICT_C90)
check_c_source_compiles( check_c_source_compiles(
"#include <malloc.h> "#include <malloc.h>
int main() { void* ptr = _alloca(256); return 0; }" int main() { void* ptr = _alloca(256); return 0; }"
GMIO_HAVE_WIN_ALLOCA_FUNC) # TODO: rename to GMIO_HAVE_WIN__ALLOCA_FUNC GMIO_HAVE_WIN__ALLOCA_FUNC)
endif() # WIN32 endif() # WIN32
endif() endif()

4
src/gmio_core/buffer.c
View File

@ -19,7 +19,7 @@
#if defined(GMIO_HAVE_BSD_ALLOCA_FUNC) #if defined(GMIO_HAVE_BSD_ALLOCA_FUNC)
# include <alloca.h> # include <alloca.h>
#elif defined(GMIO_HAVE_WIN_ALLOCA_FUNC) #elif defined(GMIO_HAVE_WIN__ALLOCA_FUNC)
# include "error.h" # include "error.h"
# include <windows.h> # include <windows.h>
# include <malloc.h> # include <malloc.h>
@ -60,7 +60,7 @@ gmio_buffer_t gmio_buffer_alloca(size_t size)
{ {
#if defined(GMIO_HAVE_BSD_ALLOCA_FUNC) #if defined(GMIO_HAVE_BSD_ALLOCA_FUNC)
return gmio_buffer(alloca(size), size, NULL); return gmio_buffer(alloca(size), size, NULL);
#elif defined(GMIO_HAVE_WIN_ALLOCA_FUNC) #elif defined(GMIO_HAVE_WIN__ALLOCA_FUNC)
# ifdef _MSC_VER # ifdef _MSC_VER
__try { __try {
return gmio_buffer(_alloca(size), size, NULL); return gmio_buffer(_alloca(size), size, NULL);

2
src/gmio_core/config.h.cmake
View File

@ -37,7 +37,7 @@
#cmakedefine GMIO_HOST_IS_BIG_ENDIAN #cmakedefine GMIO_HOST_IS_BIG_ENDIAN
#cmakedefine GMIO_HAVE_BSD_ALLOCA_FUNC #cmakedefine GMIO_HAVE_BSD_ALLOCA_FUNC
#cmakedefine GMIO_HAVE_WIN_ALLOCA_FUNC #cmakedefine GMIO_HAVE_WIN__ALLOCA_FUNC
#if defined(__APPLE__) #if defined(__APPLE__)
# if defined(__i386__) || defined(__ppc__) # if defined(__i386__) || defined(__ppc__)