Hey there,
I did all of the annoying work of fixing some of the bbtools, so they
now compile and work fine with gcc to be 3.0.
Since it is trivial but uninteresting, maybe some of you could benefit.
Anyway -- here goes:
Against:
bbdate-0.2.1
bbkeys-0.3.6
bbmail-0.6.10
bbpager-0.3.0
bbppp-0.2.1
bbsload-0.2.5
bbtime-0.1.3
Take care,
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 bbdate-0.2.1/Image.cc bbdate-0.2.1.mmj/Image.cc
--- bbdate-0.2.1/Image.cc Mon May 3 22:24:53 1999
+++ bbdate-0.2.1.mmj/Image.cc Tue Apr 3 00:30:00 2001
@@ -225,13 +225,12 @@
}
if (control->doDither()) {
- short er, eg, eb, *or, *og, *ob, *nor, *nog, *nob, *por, *pog, *pob;
+ short er, eg, eb, *or_, *og, *ob, *nor_, *nog, *nob, *por, *pog, *pob;
unsigned short *ort, *ogt, *obt;
- control->getDitherBuffers(width + 2, &or, &og, &ob, &nor, &nog, &nob,
+ control->getDitherBuffers(width + 2, &or_, &og, &ob, &nor_, &nog, &nob,
&ort, &ogt, &obt);
- if ((! or) || (! og) || (! ob) || (! nor) || (! nog) || (! nob) ||
- (! ort) || (! ogt) || (! obt)) {
+ if ((! or_) || (! og) || (! ob) || (! nor_) || (! nog) || (! nob) || (! ort) ||
+(! ogt) || (! obt)) {
fprintf(stderr,
"BImage::renderXImage: error getting dither information\n");
XDestroyImage(image);
@@ -240,7 +239,7 @@
x = width;
- por = or;
+ por = or_;
pog = og;
pob = ob;
@@ -259,26 +258,26 @@
for (y = 0, off = 0; y < height; y++) {
if (y < (height - 1)) {
for (x = 0, i = off + width; x < width; x++, i++) {
- *(nor + x) = *(red + i);
+ *(nor_ + x) = *(red + i);
*(nog + x) = *(green + i);
*(nob + x) = *(blue + i);
}
i--;
- *(nor + x) = *(red + i);
+ *(nor_ + x) = *(red + i);
*(nog + x) = *(green + i);
*(nob + x) = *(blue + i);
}
for (x = 0; x < width; x++) {
- if (*(or + x) > 255) *(or + x) = 255;
- else if (*(or + x) < 0) *(or + x) = 0;
+ if (*(or_ + x) > 255) *(or_ + x) = 255;
+ else if (*(or_ + x) < 0) *(or_ + x) = 0;
if (*(og + x) > 255) *(og + x) = 255;
else if (*(og + x) < 0) *(og + x) = 0;
if (*(ob + x) > 255) *(ob + x) = 255;
else if (*(ob + x) < 0) *(ob + x) = 0;
- r = *(tr + *(or + x));
+ r = *(tr + *(or_ + x));
g = *(tg + *(og + x));
b = *(tb + *(ob + x));
@@ -340,19 +339,19 @@
return 0;
}
- er = *(or + x) - *(ort + *(or + x));
+ er = *(or_ + x) - *(ort + *(or_ + x));
eg = *(og + x) - *(ogt + *(og + x));
eb = *(ob + x) - *(obt + *(ob + x));
- *(or + x + 1) += er;
+ *(or_ + x + 1) += er;
*(og + x + 1) += eg;
*(ob + x + 1) += eb;
- *(nor + x) += er;
+ *(nor_ + x) += er;
*(nog + x) += eg;
*(nob + x) += eb;
- *(nor + x + 1) -= (er >> 1) + (er >> 2);
+ *(nor_ + x + 1) -= (er >> 1) + (er >> 2);
*(nog + x + 1) -= (eg >> 1) + (eg >> 2);
*(nob + x + 1) -= (eb >> 1) + (eb >> 2);
}
@@ -360,7 +359,7 @@
off += image->width;
idata = (pd += image->bytes_per_line);
- por = or; or = nor; nor = por;
+ por = or_; or_ = nor_; nor_ = por;
pog = og; og = nog; nog = pog;
pob = ob; ob = nob; nob = pob;
}
diff -urN bbdate-0.2.1/LinkedList.hh bbdate-0.2.1.mmj/LinkedList.hh
--- bbdate-0.2.1/LinkedList.hh Mon May 3 22:24:53 1999
+++ bbdate-0.2.1.mmj/LinkedList.hh Mon Apr 2 23:17:02 2001
@@ -63,7 +63,7 @@
int elements;
__llist_node *_first, *_last;
- friend __llist_iterator;
+ friend class __llist_iterator;
protected:
diff -urN bbdate-0.2.1/bbdate.hh bbdate-0.2.1.mmj/bbdate.hh
--- bbdate-0.2.1/bbdate.hh Mon May 3 22:24:53 1999
+++ bbdate-0.2.1.mmj/bbdate.hh Mon Apr 2 23:20:36 2001
@@ -24,6 +24,7 @@
#include "Image.hh"
#include "Basewindow.hh"
#include "resource.hh"
+#include <time.h>
#define LEFT_BUTTON 1
#define MIDDLE_BUTTON 2
diff -urN bbkeys-0.3.6/LinkedList.hh bbkeys-0.3.6.mmj/LinkedList.hh
--- bbkeys-0.3.6/LinkedList.hh Wed Mar 14 03:42:14 2001
+++ bbkeys-0.3.6.mmj/LinkedList.hh Mon Apr 2 23:39:53 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 bbkeys-0.3.6/Timer.hh bbkeys-0.3.6.mmj/Timer.hh
--- bbkeys-0.3.6/Timer.hh Wed Mar 14 03:42:14 2001
+++ bbkeys-0.3.6.mmj/Timer.hh Mon Apr 2 23:40:02 2001
@@ -47,7 +47,7 @@
class BTimer {
- friend BaseDisplay;
+ friend class BaseDisplay;
private:
BaseDisplay *display;
TimeoutHandler *handler;
diff -urN bbmail-0.6.10/Basemenu.hh bbmail-0.6.10.mmj/Basemenu.hh
--- bbmail-0.6.10/Basemenu.hh Sat Feb 12 14:51:13 2000
+++ bbmail-0.6.10.mmj/Basemenu.hh Mon Apr 2 23:45:25 2001
@@ -133,7 +133,7 @@
char **u, *l, *e;
int f;
- friend Basemenu;
+ friend class Basemenu;
protected:
diff -urN bbmail-0.6.10/LinkedList.hh bbmail-0.6.10.mmj/LinkedList.hh
--- bbmail-0.6.10/LinkedList.hh Tue Oct 3 20:24:22 2000
+++ bbmail-0.6.10.mmj/LinkedList.hh Mon Apr 2 23:45:38 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 bbmail-0.6.10/Timer.hh bbmail-0.6.10.mmj/Timer.hh
--- bbmail-0.6.10/Timer.hh Sun Feb 13 12:05:48 2000
+++ bbmail-0.6.10.mmj/Timer.hh Mon Apr 2 23:45:52 2001
@@ -47,7 +47,7 @@
class BTimer {
- friend BaseDisplay;
+ friend class BaseDisplay;
private:
BaseDisplay *display;
TimeoutHandler *handler;
diff -urN bbtime-0.1.3/Basemenu.hh bbtime-0.1.3.mmj/Basemenu.hh
--- bbtime-0.1.3/Basemenu.hh Fri Aug 13 20:28:38 1999
+++ bbtime-0.1.3.mmj/Basemenu.hh Tue Apr 3 00:10:14 2001
@@ -123,7 +123,7 @@
char **u, *l, *e;
int f;
- friend Basemenu;
+ friend class Basemenu;
protected:
diff -urN bbtime-0.1.3/Image.cc bbtime-0.1.3.mmj/Image.cc
--- bbtime-0.1.3/Image.cc Mon May 3 22:24:53 1999
+++ bbtime-0.1.3.mmj/Image.cc Tue Apr 3 00:24:23 2001
@@ -225,12 +225,12 @@
}
if (control->doDither()) {
- short er, eg, eb, *or, *og, *ob, *nor, *nog, *nob, *por, *pog, *pob;
+ short er, eg, eb, *or_, *og, *ob, *nor_, *nog, *nob, *por, *pog, *pob;
unsigned short *ort, *ogt, *obt;
- control->getDitherBuffers(width + 2, &or, &og, &ob, &nor, &nog, &nob,
+ control->getDitherBuffers(width + 2, &or_, &og, &ob, &nor_, &nog, &nob,
&ort, &ogt, &obt);
- if ((! or) || (! og) || (! ob) || (! nor) || (! nog) || (! nob) ||
+ if ((! or_) || (! og) || (! ob) || (! nor_) || (! nog) || (! nob) ||
(! ort) || (! ogt) || (! obt)) {
fprintf(stderr,
"BImage::renderXImage: error getting dither information\n");
@@ -240,7 +240,7 @@
x = width;
- por = or;
+ por = or_;
pog = og;
pob = ob;
@@ -259,26 +259,26 @@
for (y = 0, off = 0; y < height; y++) {
if (y < (height - 1)) {
for (x = 0, i = off + width; x < width; x++, i++) {
- *(nor + x) = *(red + i);
+ *(nor_ + x) = *(red + i);
*(nog + x) = *(green + i);
*(nob + x) = *(blue + i);
}
i--;
- *(nor + x) = *(red + i);
+ *(nor_ + x) = *(red + i);
*(nog + x) = *(green + i);
*(nob + x) = *(blue + i);
}
for (x = 0; x < width; x++) {
- if (*(or + x) > 255) *(or + x) = 255;
- else if (*(or + x) < 0) *(or + x) = 0;
+ if (*(or_ + x) > 255) *(or_ + x) = 255;
+ else if (*(or_ + x) < 0) *(or_ + x) = 0;
if (*(og + x) > 255) *(og + x) = 255;
else if (*(og + x) < 0) *(og + x) = 0;
if (*(ob + x) > 255) *(ob + x) = 255;
else if (*(ob + x) < 0) *(ob + x) = 0;
- r = *(tr + *(or + x));
+ r = *(tr + *(or_ + x));
g = *(tg + *(og + x));
b = *(tb + *(ob + x));
@@ -340,19 +340,19 @@
return 0;
}
- er = *(or + x) - *(ort + *(or + x));
+ er = *(or_ + x) - *(ort + *(or_ + x));
eg = *(og + x) - *(ogt + *(og + x));
eb = *(ob + x) - *(obt + *(ob + x));
- *(or + x + 1) += er;
+ *(or_ + x + 1) += er;
*(og + x + 1) += eg;
*(ob + x + 1) += eb;
- *(nor + x) += er;
+ *(nor_ + x) += er;
*(nog + x) += eg;
*(nob + x) += eb;
- *(nor + x + 1) -= (er >> 1) + (er >> 2);
+ *(nor_ + x + 1) -= (er >> 1) + (er >> 2);
*(nog + x + 1) -= (eg >> 1) + (eg >> 2);
*(nob + x + 1) -= (eb >> 1) + (eb >> 2);
}
@@ -360,7 +360,7 @@
off += image->width;
idata = (pd += image->bytes_per_line);
- por = or; or = nor; nor = por;
+ por = or_; or_ = nor_; nor_ = por;
pog = og; og = nog; nog = pog;
pob = ob; ob = nob; nob = pob;
}
diff -urN bbtime-0.1.3/LinkedList.hh bbtime-0.1.3.mmj/LinkedList.hh
--- bbtime-0.1.3/LinkedList.hh Mon May 3 22:24:53 1999
+++ bbtime-0.1.3.mmj/LinkedList.hh Tue Apr 3 00:10:25 2001
@@ -63,7 +63,7 @@
int elements;
__llist_node *_first, *_last;
- friend __llist_iterator;
+ friend class __llist_iterator;
protected:
diff -urN bbtime-0.1.3/bbtime.hh bbtime-0.1.3.mmj/bbtime.hh
--- bbtime-0.1.3/bbtime.hh Sun Aug 15 19:43:16 1999
+++ bbtime-0.1.3.mmj/bbtime.hh Tue Apr 3 00:21:43 2001
@@ -25,6 +25,7 @@
#include "Basewindow.hh"
#include "resource.hh"
#include "timemenu.hh"
+#include <time.h>
#define LEFT_BUTTON 1
#define MIDDLE_BUTTON 2
diff -urN bbpager-0.3.0/LinkedList.hh bbpager-0.3.0.mmj/LinkedList.hh
--- bbpager-0.3.0/LinkedList.hh Wed Sep 27 22:35:33 2000
+++ bbpager-0.3.0.mmj/LinkedList.hh Mon Apr 2 23:54:46 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 bbpager-0.3.0/Timer.hh bbpager-0.3.0.mmj/Timer.hh
--- bbpager-0.3.0/Timer.hh Tue Dec 7 20:44:23 1999
+++ bbpager-0.3.0.mmj/Timer.hh Mon Apr 2 23:54:57 2001
@@ -47,7 +47,7 @@
class BTimer {
- friend BaseDisplay;
+ friend class BaseDisplay;
private:
BaseDisplay *display;
TimeoutHandler *handler;
diff -urN bbppp-0.2.1/LinkedList.hh bbppp-0.2.1.mmj/LinkedList.hh
--- bbppp-0.2.1/LinkedList.hh Tue Oct 3 21:19:07 2000
+++ bbppp-0.2.1.mmj/LinkedList.hh Tue Apr 3 00:04:47 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 bbppp-0.2.1/Timer.hh bbppp-0.2.1.mmj/Timer.hh
--- bbppp-0.2.1/Timer.hh Fri May 26 20:48:11 2000
+++ bbppp-0.2.1.mmj/Timer.hh Tue Apr 3 00:04:54 2001
@@ -47,7 +47,7 @@
class BTimer {
- friend BaseDisplay;
+ friend class BaseDisplay;
private:
BaseDisplay *display;
TimeoutHandler *handler;
diff -urN bbsload-0.2.5/LinkedList.hh bbsload-0.2.5.mmj/LinkedList.hh
--- bbsload-0.2.5/LinkedList.hh Tue Oct 3 21:25:27 2000
+++ bbsload-0.2.5.mmj/LinkedList.hh Tue Apr 3 00:08:09 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 bbsload-0.2.5/Timer.hh bbsload-0.2.5.mmj/Timer.hh
--- bbsload-0.2.5/Timer.hh Sun Apr 9 12:27:34 2000
+++ bbsload-0.2.5.mmj/Timer.hh Tue Apr 3 00:08:18 2001
@@ -47,7 +47,7 @@
class BTimer {
- friend BaseDisplay;
+ friend class BaseDisplay;
private:
BaseDisplay *display;
TimeoutHandler *handler;
