diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 16:31:48 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 16:31:48 +0000 |
| commit | 4942a7b77917f9a163453ecdd040993965672cc0 (patch) | |
| tree | 3dd01f5e182d2eea2e34528cebe749d948a477fc /indra/llcommon/llsys.cpp | |
| parent | 9fc7049151a16e3722c6ce90899e3c7b63161615 (diff) | |
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
Diffstat (limited to 'indra/llcommon/llsys.cpp')
| -rw-r--r-- | indra/llcommon/llsys.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index b1b92ae277..86ec4c0d61 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -24,10 +24,12 @@ # include <winsock2.h> # include <windows.h> #elif LL_DARWIN +# include <errno.h> # include <sys/sysctl.h> # include <sys/utsname.h> # include <stdint.h> #elif LL_LINUX +# include <errno.h> # include <sys/utsname.h> # include <unistd.h> # include <sys/sysinfo.h> |