diff options
author | marha <marha@users.sourceforge.net> | 2015-03-22 14:10:47 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2015-03-22 14:10:47 +0100 |
commit | 3bc24b271f45f9f33484b8cf53b44f33f7e8a237 (patch) | |
tree | 193651a94adb3804e800747e993d07b92688e4d4 /mesalib/src/loader | |
parent | c646056120fe14e4c4ccf81bac5d78d61225a8e8 (diff) | |
parent | 82c8df11062f72a7d467e26cedbbd8b322ff7a70 (diff) | |
download | vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.gz vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.bz2 vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mapi/glapi/glapi_nop.c
mesalib/src/mesa/main/bufferobj.c
Diffstat (limited to 'mesalib/src/loader')
-rw-r--r-- | mesalib/src/loader/loader.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/loader/loader.c b/mesalib/src/loader/loader.c index 9ff511522..17bf13360 100644 --- a/mesalib/src/loader/loader.c +++ b/mesalib/src/loader/loader.c @@ -64,6 +64,7 @@ * Rob Clark <robclark@freedesktop.org> */ +#include <sys/stat.h> #include <stdarg.h> #include <stdio.h> #include <string.h> @@ -80,7 +81,6 @@ #endif #endif #ifdef HAVE_SYSFS -#include <sys/stat.h> #include <sys/types.h> #endif #include "loader.h" |