* Mads Martin Jørgensen <[EMAIL PROTECTED]> [Mar 22. 2001 13:09]:
[snip newer gcc errormessage]
> If anyone have patches to fix this, I would love to have a copy.
Dunno if anyone can use this trivial patch, but here you go. With this
patch blackbox builds on both older and newer versions of gcc. Might be
a good idea to put in, since it does not break anything. Against 0.61.1.
Thanks,
Mads Martin
--
Mads Martin Joergensen, http://mmj.dk
"Why make things difficult, when it is possible to make them cryptic and
totally illogic, with just a little bit more effort."
-- A. P. J.
diff -urN blackbox-0.61.1/src/Basemenu.hh blackbox-0.61.1.mmj/src/Basemenu.hh
--- blackbox-0.61.1/src/Basemenu.hh Sun Jun 18 04:51:46 2000
+++ blackbox-0.61.1.mmj/src/Basemenu.hh Mon Apr 2 20:08:46 2001
@@ -140,7 +140,7 @@
const char **u, *l, *e;
int f, enabled, selected;
- friend Basemenu;
+ friend class Basemenu;
protected:
diff -urN blackbox-0.61.1/src/Configmenu.hh blackbox-0.61.1.mmj/src/Configmenu.hh
--- blackbox-0.61.1/src/Configmenu.hh Thu Jun 1 00:42:49 2000
+++ blackbox-0.61.1.mmj/src/Configmenu.hh Mon Apr 2 20:09:33 2001
@@ -59,8 +59,8 @@
Focusmenu *focusmenu;
Placementmenu *placementmenu;
- friend Focusmenu;
- friend Placementmenu;
+ friend class Focusmenu;
+ friend class Placementmenu;
protected:
diff -urN blackbox-0.61.1/src/LinkedList.hh blackbox-0.61.1.mmj/src/LinkedList.hh
--- blackbox-0.61.1/src/LinkedList.hh Thu Jun 1 00:42:49 2000
+++ blackbox-0.61.1.mmj/src/LinkedList.hh Mon Apr 2 20:06:54 2001
@@ -50,7 +50,7 @@
__llist *list;
__llist_node *node;
- friend __llist;
+ friend class __llist;
protected:
@@ -73,7 +73,7 @@
__llist_node *_first, *_last;
__llist *iterators;
- friend __llist_iterator;
+ friend class __llist_iterator;
protected:
diff -urN blackbox-0.61.1/src/Slit.hh blackbox-0.61.1.mmj/src/Slit.hh
--- blackbox-0.61.1/src/Slit.hh Fri Oct 6 07:53:08 2000
+++ blackbox-0.61.1.mmj/src/Slit.hh Mon Apr 2 20:08:18 2001
@@ -62,9 +62,9 @@
Slit *slit;
- friend Directionmenu;
- friend Placementmenu;
- friend Slit;
+ friend class Directionmenu;
+ friend class Placementmenu;
+ friend class Slit;
protected:
@@ -111,9 +111,9 @@
unsigned int width, height;
} frame;
- friend Slitmenu;
- friend Slitmenu::Directionmenu;
- friend Slitmenu::Placementmenu;
+ friend class Slitmenu;
+ friend class Slitmenu::Directionmenu;
+ friend class Slitmenu::Placementmenu;
public:
diff -urN blackbox-0.61.1/src/Timer.hh blackbox-0.61.1.mmj/src/Timer.hh
--- blackbox-0.61.1/src/Timer.hh Thu Jun 1 00:42:49 2000
+++ blackbox-0.61.1.mmj/src/Timer.hh Mon Apr 2 20:07:09 2001
@@ -47,7 +47,7 @@
class BTimer {
- friend BaseDisplay;
+ friend class BaseDisplay;
private:
BaseDisplay *display;
TimeoutHandler *handler;
diff -urN blackbox-0.61.1/src/Toolbar.hh blackbox-0.61.1.mmj/src/Toolbar.hh
--- blackbox-0.61.1/src/Toolbar.hh Fri Oct 6 07:53:08 2000
+++ blackbox-0.61.1.mmj/src/Toolbar.hh Mon Apr 2 20:10:08 2001
@@ -48,8 +48,8 @@
Toolbar *toolbar;
Placementmenu *placementmenu;
- friend Placementmenu;
- friend Toolbar;
+ friend class Placementmenu;
+ friend class Toolbar;
protected:
@@ -97,9 +97,9 @@
char *new_workspace_name, *new_name_pos;
- friend HideHandler;
- friend Toolbarmenu;
- friend Toolbarmenu::Placementmenu;
+ friend class HideHandler;
+ friend class Toolbarmenu;
+ friend class Toolbarmenu::Placementmenu;
public:
diff -urN blackbox-0.61.1/src/Windowmenu.hh blackbox-0.61.1.mmj/src/Windowmenu.hh
--- blackbox-0.61.1/src/Windowmenu.hh Thu Jun 1 00:42:49 2000
+++ blackbox-0.61.1.mmj/src/Windowmenu.hh Mon Apr 2 20:09:02 2001
@@ -55,7 +55,7 @@
SendtoWorkspacemenu *sendToMenu;
- friend SendtoWorkspacemenu;
+ friend class SendtoWorkspacemenu;
protected:
diff -urN blackbox-0.61.1/src/main.cc blackbox-0.61.1.mmj/src/main.cc
--- blackbox-0.61.1/src/main.cc Fri Oct 6 14:35:31 2000
+++ blackbox-0.61.1.mmj/src/main.cc Mon Apr 2 22:03:54 2001
@@ -55,6 +55,10 @@
#define MAXPATHLEN 255
#endif // MAXPATHLEN
+// printf defined as a macro? (gcc3 issue)
+#ifdef __GLIBC__
+#undef printf
+#endif
int main(int argc, char **argv) {
char *session_display = (char *) 0;
