$FreeBSD: ports/editors/lfhex/files/patch-src::reader.cpp,v 1.5 2005/01/19 12:47:34 krion Exp $

--- src/reader.cpp.orig

+++ src/reader.cpp

@@ -12,6 +12,7 @@

 #include <stdexcept>

 #include <algorithm>

 #include <new>

+#include <cassert>

 // for stat:

 #include <sys/types.h>

@@ -117,7 +118,7 @@

   return true;

 }

-INLINE bool Reader::is_open() const

+bool Reader::is_open() const

 {

   return _is_open;

 }

@@ -195,14 +196,14 @@

   return _offset;

 }

-INLINE off_t Reader::tell() const

+off_t Reader::tell() const

 {

   if(!is_open())

     return -1;

   return _offset;

 }

-INLINE off_t Reader::size() const

+off_t Reader::size() const

 {

   return _size;

 }

@@ -231,7 +232,7 @@

     // free the page which is the furthest away from the page we are loading

     // this could be trouble if off_t is unsigned!

-    if( abs(_firstPage - pageIdx) > abs(_lastPage - pageIdx) ) 

+    if( abs((long int)(_firstPage - pageIdx)) > abs((long int)(_lastPage - pageIdx)) ) 

       while(!freePage(_firstPage++));

     else

       while(!freePage(_lastPage--));

$FreeBSD: ports/editors/lfhex/files/patch-src::reader.hpp,v 1.2 2005/01/19 12:47:34 krion Exp $

--- src/reader.hpp.orig

+++ src/reader.hpp

@@ -33,12 +33,6 @@

 #include "local.h"

-#ifdef DEBUG

-#define INLINE

-#else

-#define INLINE inline

-#endif

-

 typedef vector<uchar> ReadBuffer;

 #ifdef __GNUC__

@@ -54,12 +48,12 @@

   bool open(const string& filename);

   bool close();

   bool eof();

-  INLINE bool is_open() const;

+  bool is_open() const;

   size_t read( ReadBuffer& v, size_t numBytes );

   off_t  seek( off_t offset );

-  INLINE off_t tell() const; // returns the current offset or -1 if !open

-  INLINE off_t size() const;

+  off_t tell() const; // returns the current offset or -1 if !open

+  off_t size() const;

   const char* lastError() const;

   const char* filename() const;