diff options
author | Richard Linden <none@none> | 2013-01-04 16:46:25 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-01-04 16:46:25 -0800 |
commit | 0d8f1077a62099915cb532dc354d0e450e3e6a79 (patch) | |
tree | f76f43d025304bc6aa65d3f91663cac67a6715cc /indra/llcommon/llfile.cpp | |
parent | 0d12d171cf20c63a45e7ad0989e65d05aabb86ea (diff) | |
parent | 7dbb8860373769dfca7d6c6588284866a1bf86a3 (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/llcommon/llfile.cpp')
-rw-r--r-- | indra/llcommon/llfile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp index c51d042a3d..5917d7a420 100644 --- a/indra/llcommon/llfile.cpp +++ b/indra/llcommon/llfile.cpp @@ -28,7 +28,7 @@ */ #if LL_WINDOWS -#include <windows.h> +#include "llwin32headerslean.h" #include <stdlib.h> // Windows errno #else #include <errno.h> |