diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-31 16:29:17 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-31 16:29:17 +0000 |
| commit | a3d64deb4ee72f27441dd5363d74c294b7dd34a7 (patch) | |
| tree | e8cd428e662cdeec5e8376d1aac3ab07eb5edbce /tools/gator/daemon/Fifo.cpp | |
| parent | 335ab1659bbf3ecf8dc1ba31e66111d35d54e8c9 (diff) | |
| parent | 715db954c8f2d97a6742ff13be91c99db22135e9 (diff) | |
Merge branch 'lsk-3.10-gator' of git://git.linaro.org/landing-teams/working/arm/kernel into lsk-v3.10-gator
Diffstat (limited to 'tools/gator/daemon/Fifo.cpp')
| -rw-r--r-- | tools/gator/daemon/Fifo.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/gator/daemon/Fifo.cpp b/tools/gator/daemon/Fifo.cpp index f672e92a6807..41275fd287b8 100644 --- a/tools/gator/daemon/Fifo.cpp +++ b/tools/gator/daemon/Fifo.cpp @@ -9,9 +9,6 @@ #include "Fifo.h" #include <stdlib.h> -#ifdef WIN32 -#define valloc malloc -#endif #include "Logging.h" @@ -23,7 +20,7 @@ Fifo::Fifo(int singleBufferSize, int bufferSize, sem_t* readerSem) { mWrapThreshold = bufferSize; mSingleBufferSize = singleBufferSize; mReaderSem = readerSem; - mBuffer = (char*)valloc(bufferSize + singleBufferSize); + mBuffer = (char*)malloc(bufferSize + singleBufferSize); mEnd = false; if (mBuffer == NULL) { |