diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
| commit | a5b4b0f21c1ae8c96e4fea9abdcfac2fab1cf300 (patch) | |
| tree | 0658d8bdfb8ec03652aa04f82ee8a4d243ec6370 /intern/string | |
| parent | d68f698cf0321477c0734474150eb4bc43c4e85f (diff) | |
| parent | abcda06934aba054de8540b66b13c2bbc5f8f515 (diff) | |
Merge branch '28' into custom-manipulatorscustom-manipulators
Diffstat (limited to 'intern/string')
| -rw-r--r-- | intern/string/intern/STR_String.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/intern/string/intern/STR_String.cpp b/intern/string/intern/STR_String.cpp index 4612c91b6a6..3ec65ddc725 100644 --- a/intern/string/intern/STR_String.cpp +++ b/intern/string/intern/STR_String.cpp @@ -37,9 +37,6 @@ #include <stdlib.h> #include <ctype.h> #include <string.h> -#if defined(__sun__) || defined(__sun) || defined(__sparc) || defined(__sparc__) || defined(_AIX) -# include <strings.h> -#endif #include "STR_String.h" /*------------------------------------------------------------------------------------------------- |