epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Fix Windows problems from Valgrind merge.

Browse Source
This commit is contained in:
Andrew Johnson
2016-02-09 14:10:51 -06:00
parent 87759d1c1d
commit 445c0ada8c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libCom/freeList/freeListLib.c
Regular → Executable
+1 -1
View File
@@ -107,7 +107,7 @@ epicsShareFunc void * epicsShareAPI freeListMalloc(void *pvt)
return(0);
}
pallocmem->memory = ptemp; /* real allocation */
ptemp += REDZONE; /* skip first REDZONE */
ptemp = REDZONE + (char *) ptemp; /* skip first REDZONE */
if(pfl->mallochead)
pallocmem->next = pfl->mallochead;
pfl->mallochead = pallocmem;
src/libCom/valgrind/valgrind.h
Regular → Executable
+2 -2
View File
@@ -130,10 +130,10 @@
# define PLAT_amd64_darwin 1
#elif (defined(__MINGW32__) && !defined(__MINGW64__)) \
|| defined(__CYGWIN32__) \
|| (defined(_WIN32) && defined(_M_IX86))
|| (defined(_WIN32) && defined(_M_IX86) && defined(__GNUC__))
# define PLAT_x86_win32 1
#elif defined(__MINGW64__) \
|| (defined(_WIN64) && defined(_M_X64))
|| (defined(_WIN64) && defined(_M_X64) && defined(__GNUC__))
# define PLAT_amd64_win64 1
#elif defined(__linux__) && defined(__i386__)
# define PLAT_x86_linux 1