diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2011-03-23 11:02:15 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2011-03-23 11:02:15 (GMT) |
commit | e850b0191977da47eb7233e248dbab7ebd1d21f0 (patch) | |
tree | d3a3e33f1d4524147ddaa2b6b21e05bd142fc367 /src/ClientPattern.cc | |
parent | 7ece90ad4f360b3cf11e46a00d4c1ec5b60213e9 (diff) | |
download | fluxbox_pavel-e850b0191977da47eb7233e248dbab7ebd1d21f0.zip fluxbox_pavel-e850b0191977da47eb7233e248dbab7ebd1d21f0.tar.bz2 |
compile fix: sunCC 5.11 (sunstudio 12) compiles and links again
biggest change: renaming of 'class Layer' to 'class ResourceLayer' in
Layer.hh to handle complaints about 'ambiguous Layer: Layer or FbTk::Layer'.
'ResourceLayer' sounds crappy, but that was the best I could come
up with right now.
Diffstat (limited to 'src/ClientPattern.cc')
-rw-r--r-- | src/ClientPattern.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ClientPattern.cc b/src/ClientPattern.cc index 500574e..b2ad691 100644 --- a/src/ClientPattern.cc +++ b/src/ClientPattern.cc | |||
@@ -87,11 +87,13 @@ const Name2WinProperty name_2_winproperties[] = { // sorted for 'bsearch' | |||
87 | { "workspacename", ClientPattern::WORKSPACENAME } | 87 | { "workspacename", ClientPattern::WORKSPACENAME } |
88 | }; | 88 | }; |
89 | 89 | ||
90 | extern "C" { | ||
90 | int name_2_winproperty_cmp(const void* a, const void* b) { | 91 | int name_2_winproperty_cmp(const void* a, const void* b) { |
91 | return strcmp( | 92 | return strcmp( |
92 | reinterpret_cast<const Name2WinProperty*>(a)->name, | 93 | reinterpret_cast<const Name2WinProperty*>(a)->name, |
93 | reinterpret_cast<const Name2WinProperty*>(b)->name); | 94 | reinterpret_cast<const Name2WinProperty*>(b)->name); |
94 | } | 95 | } |
96 | } | ||
95 | 97 | ||
96 | const Name2WinProperty* find_winproperty_by_name(const FbTk::FbString& name) { | 98 | const Name2WinProperty* find_winproperty_by_name(const FbTk::FbString& name) { |
97 | 99 | ||
@@ -442,7 +444,7 @@ FbTk::FbString ClientPattern::getProperty(WinProperty prop, const Focusable &cli | |||
442 | break; | 444 | break; |
443 | case LAYER: | 445 | case LAYER: |
444 | if (fbwin) { | 446 | if (fbwin) { |
445 | result = ::Layer::getString(fbwin->layerNum()); | 447 | result = ::ResourceLayer::getString(fbwin->layerNum()); |
446 | } | 448 | } |
447 | break; | 449 | break; |
448 | case URGENT: | 450 | case URGENT: |