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/llvfs | |
| parent | 9fc7049151a16e3722c6ce90899e3c7b63161615 (diff) | |
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/lldir.cpp | 1 | ||||
| -rw-r--r-- | indra/llvfs/lldir_linux.h | 1 | ||||
| -rw-r--r-- | indra/llvfs/lldir_mac.h | 1 | ||||
| -rw-r--r-- | indra/llvfs/lldir_solaris.h | 1 | ||||
| -rw-r--r-- | indra/llvfs/llvfs.cpp | 2 | ||||
| -rw-r--r-- | indra/llvfs/llvfs.h | 2 |
6 files changed, 1 insertions, 7 deletions
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 94c1b5de24..5203e31ff9 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -11,6 +11,7 @@ #if !LL_WINDOWS #include <sys/stat.h> #include <sys/types.h> +#include <errno.h> #else #include <direct.h> #endif diff --git a/indra/llvfs/lldir_linux.h b/indra/llvfs/lldir_linux.h index 3e63e72303..767c8b3475 100644 --- a/indra/llvfs/lldir_linux.h +++ b/indra/llvfs/lldir_linux.h @@ -11,7 +11,6 @@ #include "lldir.h" -#include <stdio.h> #include <dirent.h> #include <errno.h> diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h index 1375f142f4..9815e3afac 100644 --- a/indra/llvfs/lldir_mac.h +++ b/indra/llvfs/lldir_mac.h @@ -11,7 +11,6 @@ #include "lldir.h" -#include <stdio.h> #include <dirent.h> class LLDir_Mac : public LLDir diff --git a/indra/llvfs/lldir_solaris.h b/indra/llvfs/lldir_solaris.h index 1ab76230ee..ad3bc4525b 100644 --- a/indra/llvfs/lldir_solaris.h +++ b/indra/llvfs/lldir_solaris.h @@ -11,7 +11,6 @@ #include "lldir.h" -#include <stdio.h> #include <dirent.h> #include <errno.h> diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp index 0054e87755..f599ae122b 100644 --- a/indra/llvfs/llvfs.cpp +++ b/indra/llvfs/llvfs.cpp @@ -8,9 +8,7 @@ #include "linden_common.h" -#include <stdio.h> #include <sys/stat.h> -#include <time.h> #include <set> #include <map> #if LL_WINDOWS diff --git a/indra/llvfs/llvfs.h b/indra/llvfs/llvfs.h index 5089e059e8..d18797fe4e 100644 --- a/indra/llvfs/llvfs.h +++ b/indra/llvfs/llvfs.h @@ -9,8 +9,6 @@ #ifndef LL_LLVFS_H #define LL_LLVFS_H -#include <stdio.h> -#include <map> #include <deque> #include "lluuid.h" #include "linked_lists.h" |