diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-12 11:22:24 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-12 11:22:24 +0100 |
| commit | f1b679a372274041aa3e7a02f979390b17eb1ab5 (patch) | |
| tree | f5bad38b25c1e5bf69cb06b4236cccb4310f769f /pixman/test/thread-test.c | |
| parent | 3ef320ddf5d23b4e69cc7d44a17f902e245f6426 (diff) | |
| parent | b73c544c61712f7bd57f3c9a0f6046481f58038b (diff) | |
| download | vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.tar.gz vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.tar.bz2 vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman mesa fontconfig git update 12 nov 2013
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
Diffstat (limited to 'pixman/test/thread-test.c')
| -rw-r--r-- | pixman/test/thread-test.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pixman/test/thread-test.c b/pixman/test/thread-test.c index fa2193302..0b07b269d 100644 --- a/pixman/test/thread-test.c +++ b/pixman/test/thread-test.c @@ -1,4 +1,4 @@ -#include <config.h> +#include "utils.h" #ifndef HAVE_PTHREADS @@ -12,7 +12,6 @@ int main () #include <stdlib.h> #include <pthread.h> -#include "utils.h" typedef struct { |