Attachment #133116 for bug #177512

View | Details | Raw Unified | Return to bug 177512
Collapse All | Expand All

Lines 373-379 Link Here

(-)frend.cc (-1 / +1 lines)
373		373
374	/* ############################ dimension ############################## */	374	/* ############################ dimension ############################## */
375	template <class T>	375	template <class T>
376	void dimension<T>::input(std::istream& i)	376	std::istream& dimension<T>::input(std::istream& i)
377	{	377	{
378	std::string buf, buf2;	378	std::string buf, buf2;
379	i >> buf;	379	i >> buf;

Lines 187-193 Link Here

(-)frend.h (-1 / +1 lines)
187	dimension& operator+=(const dimension& p) { _x+=p._x; _y+=p._y; return *this; }	187	dimension& operator+=(const dimension& p) { _x+=p._x; _y+=p._y; return *this; }
188	dimension& operator-=(const dimension& p) { _x-=p._x; _y-=p._y; return *this; }	188	dimension& operator-=(const dimension& p) { _x-=p._x; _y-=p._y; return *this; }
189	void print(std::ostream& o) const;	189	void print(std::ostream& o) const;
190	void input(std::istream& i);	190	std::istream& input(std::istream& i);
191	};	191	};
192	typedef dimension<int> Point;	192	typedef dimension<int> Point;
193	typedef dimension<size_t> Size;	193	typedef dimension<size_t> Size;




#include "rom.h"
#include "prefs.h"

#include <zlib.h>
# include <zlib.h>
#endif

namespace fr = frend;


	};
#ifdef ZLIB_VERSION
# define romopen(f) (gzFile*)gzopen(f.c_str(), "rb")
# define romseek(a, b, c) gzseek(*a, b, c)
# define romread(a, b, c) gzread(*a, b, c)
# define romclose(a) gzclose(*a)
   gzFile *fptr;
#else
# define romopen(f) fopen(f.c_str(), "rb")

Return to bug 177512

Lines 21-29 Link Here

(-)rom.cc (-6 / +4 lines)
21	#include "rom.h"	21	#include "rom.h"
22	#include "prefs.h"	22	#include "prefs.h"
23		23
24	#ifdef HAVE_ZLIB_H	24	#include <zlib.h>
25	# include <zlib.h>
26	#endif
27		25
28	namespace fr = frend;	26	namespace fr = frend;
29		27
Lines 209-217 Link Here
209	};	207	};
210	#ifdef ZLIB_VERSION	208	#ifdef ZLIB_VERSION
211	# define romopen(f) (gzFile*)gzopen(f.c_str(), "rb")	209	# define romopen(f) (gzFile*)gzopen(f.c_str(), "rb")
212	# define romseek gzseek	210	# define romseek(a, b, c) gzseek(*a, b, c)
213	# define romread gzread	211	# define romread(a, b, c) gzread(*a, b, c)
214	# define romclose gzclose	212	# define romclose(a) gzclose(*a)
215	gzFile *fptr;	213	gzFile *fptr;
216	#else	214	#else
217	# define romopen(f) fopen(f.c_str(), "rb")	215	# define romopen(f) fopen(f.c_str(), "rb")