Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-09-29 12:10:08 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-09-29 12:16:34 +0300
commit5a1954a5cbd7b0b1458fdc80ada5acd036278309 (patch)
tree9019c394cd7751f17ebe7822ee92adc9102fedc8 /intern
parent04e8a096622cfb91b728fa48edbc1c31ced226c1 (diff)
Drop platform support for Solaris & AIX
These platforms didn't see maintenance in years. This commit just removes ifdef's & cmake check.
Diffstat (limited to 'intern')
-rw-r--r--intern/ghost/intern/GHOST_EventPrinter.cpp10
-rw-r--r--intern/ghost/intern/GHOST_SystemX11.cpp33
-rw-r--r--intern/ghost/intern/GHOST_WindowX11.cpp4
-rw-r--r--intern/guardedalloc/MEM_guardedalloc.h2
-rw-r--r--intern/string/intern/STR_String.cpp3
5 files changed, 1 insertions, 51 deletions
diff --git a/intern/ghost/intern/GHOST_EventPrinter.cpp b/intern/ghost/intern/GHOST_EventPrinter.cpp
index f25f6637cb1..a6adba12152 100644
--- a/intern/ghost/intern/GHOST_EventPrinter.cpp
+++ b/intern/ghost/intern/GHOST_EventPrinter.cpp
@@ -193,16 +193,6 @@ void GHOST_EventPrinter::getKeyString(GHOST_TKey key, char str[32]) const
}
else if ((key >= GHOST_kKeyNumpad0) && (key <= GHOST_kKeyNumpad9)) {
sprintf(str, "Numpad %d", (key - GHOST_kKeyNumpad0));
-#if defined(__sun__) || defined(__sun)
- }
- else if (key == 268828432) { /* solaris keyboards are messed up */
- /* This should really test XK_F11 but that doesn't work */
- strcpy(str, "F11");
- }
- else if (key == 268828433) { /* solaris keyboards are messed up */
- /* This should really test XK_F12 but that doesn't work */
- strcpy(str, "F12");
-#endif
}
else if ((key >= GHOST_kKeyF1) && (key <= GHOST_kKeyF24)) {
sprintf(str, "F%d", key - GHOST_kKeyF1 + 1);
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 30cfac08153..8fff565338f 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -1601,26 +1601,6 @@ convertXKey(KeySym key)
}
else if ((key >= XK_F1) && (key <= XK_F24)) {
type = GHOST_TKey(key - XK_F1 + int(GHOST_kKeyF1));
-#if defined(__sun) || defined(__sun__)
- /* This is a bit of a hack, but it looks like sun
- * Used F11 and friends for its special keys Stop,again etc..
- * So this little patch enables F11 and F12 to work as expected
- * following link has documentation on it:
- * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4734408
- * also from /usr/include/X11/Sunkeysym.h
- * #define SunXK_F36 0x1005FF10 // Labeled F11
- * #define SunXK_F37 0x1005FF11 // Labeled F12
- *
- * mein@cs.umn.edu
- */
-
- }
- else if (key == 268828432) {
- type = GHOST_kKeyF11;
- }
- else if (key == 268828433) {
- type = GHOST_kKeyF12;
-#endif
}
else {
switch (key) {
@@ -1714,19 +1694,6 @@ convertXKey(KeySym key)
GXMAP(type, XF86XK_AudioForward, GHOST_kKeyMediaLast);
#endif
#endif
-
- /* some extra sun cruft (NICE KEYBOARD!) */
-#ifdef __sun__
- GXMAP(type, 0xffde, GHOST_kKeyNumpad1);
- GXMAP(type, 0xffe0, GHOST_kKeyNumpad3);
- GXMAP(type, 0xffdc, GHOST_kKeyNumpad5);
- GXMAP(type, 0xffd8, GHOST_kKeyNumpad7);
- GXMAP(type, 0xffda, GHOST_kKeyNumpad9);
-
- GXMAP(type, 0xffd6, GHOST_kKeyNumpadSlash);
- GXMAP(type, 0xffd7, GHOST_kKeyNumpadAsterisk);
-#endif
-
default:
type = GHOST_kKeyUnknown;
break;
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index 2019f58251f..9e019b233f6 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -59,10 +59,6 @@
//For DPI value
#include <X11/Xresource.h>
-#if defined(__sun__) || defined(__sun) || defined(__sparc) || defined(__sparc__) || defined(_AIX)
-# include <strings.h>
-#endif
-
#include <cstring>
#include <cstdio>
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h
index 05a98c1a4e5..f6048a04cf3 100644
--- a/intern/guardedalloc/MEM_guardedalloc.h
+++ b/intern/guardedalloc/MEM_guardedalloc.h
@@ -225,7 +225,7 @@ public: \
MEM_freeN(mem); \
} \
-#if defined __GNUC__ || defined __sun
+#if defined __GNUC__
# define OBJECT_GUARDED_NEW(type, args ...) \
new(MEM_mallocN(sizeof(type), __func__)) type(args)
#else
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"
/*-------------------------------------------------------------------------------------------------