aboutsummaryrefslogtreecommitdiff
path: root/pthreads/ptw32_calloc.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-18 10:51:09 +0200
committermarha <marha@users.sourceforge.net>2011-07-18 10:51:09 +0200
commit3c0d2312573b81e3067bea610a58b1940c075e05 (patch)
tree3f025a27d813374f225957801226aa8ee829a33a /pthreads/ptw32_calloc.c
parentba033884541714680fd7552ab9d6c8817650f7d8 (diff)
parent88101146f2ec7d53ffb793e365f05097ffd35fd3 (diff)
downloadvcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.tar.gz
vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.tar.bz2
vcxsrv-3c0d2312573b81e3067bea610a58b1940c075e05.zip
Merge remote-tracking branch 'origin/released'
Conflicts: X11/Xfuncproto.h.in X11/configure.ac X11/keysymdef.h freetype/include/freetype/internal/pcftypes.h freetype/src/cache/ftcbasic.c freetype/src/cache/ftccmap.c mesalib/src/glsl/ir.h mesalib/src/glsl/link_functions.cpp mesalib/src/mesa/main/dlist.c mesalib/src/mesa/program/prog_optimize.c mesalib/src/mesa/state_tracker/st_program.c pthreads/Makefile
Diffstat (limited to 'pthreads/ptw32_calloc.c')
-rw-r--r--pthreads/ptw32_calloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pthreads/ptw32_calloc.c b/pthreads/ptw32_calloc.c
index eea7c7482..e7b9e64fe 100644
--- a/pthreads/ptw32_calloc.c
+++ b/pthreads/ptw32_calloc.c
@@ -38,7 +38,7 @@
#include "implement.h"
-#ifdef NEED_CALLOC
+#if defined(NEED_CALLOC)
void *
ptw32_calloc (size_t n, size_t s)
{