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/include/c99_alloca.h | |
| 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/include/c99_alloca.h')
| -rw-r--r-- | mesalib/include/c99_alloca.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/include/c99_alloca.h b/mesalib/include/c99_alloca.h index ed66fda01..5a3b8c19a 100644 --- a/mesalib/include/c99_alloca.h +++ b/mesalib/include/c99_alloca.h @@ -35,7 +35,7 @@ # define alloca _alloca -#elif defined(__sun) +#elif defined(__sun) || defined(__CYGWIN__) # include <alloca.h> |