1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

- Fix build with gcc4

PR:   	    	 ports/112977
Submitted by:	 benjsc
Approved by:	 Li-Lun  Wang <llwang at infor.org> (maintainer)
This commit is contained in:
Rong-En Fan 2007-06-21 09:56:40 +00:00
parent ffe26aaedc
commit 280e67f768
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=193991
6 changed files with 78 additions and 0 deletions

View File

@ -0,0 +1,11 @@
--- lib/graphic16.h Fri May 25 15:04:22 2007
+++ lib2/graphic16.h Fri May 25 15:05:53 2007
@@ -24,7 +24,7 @@
class GraphicDevice16: public GraphicDevice {
private:
- long GraphicDevice16::allocColor(Color color);
+ long allocColor(Color color);
public:
GraphicDevice16(FlashDisplay *fd);

View File

@ -0,0 +1,11 @@
--- lib/graphic24.h Fri May 25 15:04:22 2007
+++ lib2/graphic24.h Fri May 25 15:06:00 2007
@@ -24,7 +24,7 @@
class GraphicDevice24: public GraphicDevice {
private:
- long GraphicDevice24::allocColor(Color color);
+ long allocColor(Color color);
public:
GraphicDevice24(FlashDisplay *fd);

View File

@ -0,0 +1,11 @@
--- lib/graphic32.h Fri May 25 15:04:22 2007
+++ lib2/graphic32.h Fri May 25 15:06:05 2007
@@ -24,7 +24,7 @@
class GraphicDevice32: public GraphicDevice {
private:
- long GraphicDevice32::allocColor(Color color);
+ long allocColor(Color color);
public:
GraphicDevice32(FlashDisplay *fd);

View File

@ -0,0 +1,18 @@
--- lib/matrix.h Fri May 25 15:04:22 2007
+++ lib2/matrix.h Fri May 25 15:05:10 2007
@@ -33,13 +33,13 @@
#endif
inline
- long Matrix::getX(long x, long y)
+ long getX(long x, long y)
{
return (long) (x*a+y*b+tx);
};
inline
- long Matrix::getY(long x, long y)
+ long getY(long x, long y)
{
return (long) (x*c+y*d+ty);
};

View File

@ -0,0 +1,15 @@
--- lib/sound.h Fri May 25 15:04:22 2007
+++ lib2/sound.h Fri May 25 15:05:20 2007
@@ -103,9 +103,9 @@
long playSounds(); // Actually play sounds of all instances
long fillSoundBuffer(SoundList *, char *buffer, long bufferSize); // Fill sound buffer
private:
- int SoundMixer::Mp3Scale(mad_fixed_t sample);
- void SoundMixer::Mp3Decompress(SoundList *sl);
- void SoundMixer::uninitMp3Sounds(SoundList *sl);
+ int Mp3Scale(mad_fixed_t sample);
+ void Mp3Decompress(SoundList *sl);
+ void uninitMp3Sounds(SoundList *sl);
};
#endif /* _SOUND_H_ */

View File

@ -0,0 +1,12 @@
--- lib/swf.h Fri May 25 15:04:22 2007
+++ lib2/swf.h Fri May 25 15:08:36 2007
@@ -199,7 +199,9 @@
#define true 1
#endif
+extern "C" {
extern int shape_size,shape_nb,shaperecord_size,shaperecord_nb,style_size,style_nb;
+};
typedef void (*ScanLineFunc)(void *id, long y, long start, long end);