Fixed bug that caused BSD disklabel conversion to fail

3 files changed, 13 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 6d4d8e8..b356096 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,9 @@
-0.6.0 (1/??/2009):
+0.6.1 (1/??/2009):
+------------------
+
+- Fixed bug that caused BSD disklabel conversion to not work.
+
+0.6.0 (1/15/2009):
 ------------------
 
 - Fixed bug that caused the convert to MBR function to fail.
diff --git a/bsd.cc b/bsd.cc
index b931d35..e1b3907 100644
--- a/bsd.cc
+++ b/bsd.cc
@@ -201,6 +201,12 @@ int BSDData::ShowState(void) {
    return retval;
 } // BSDData::ShowState()
 
+// Weirdly, this function has stopped working when defined inline,
+// but it's OK here....
+int BSDData::IsDisklabel(void) {
+   return (state == bsd);
+} // BSDData::IsDiskLabel()
+
 // Returns the BSD table's partition type code
 uint8_t BSDData::GetType(int i) {
    uint8_t retval = 0; // 0 = "unused"
diff --git a/bsd.h b/bsd.h
index afdb60c..e7fbfc7 100644
--- a/bsd.h
+++ b/bsd.h
@@ -72,7 +72,7 @@ class BSDData {
       void ReverseMetaBytes(void);
       void DisplayBSDData(void);
       int ShowState(void); // returns 1 if BSD disklabel detected
-      int IsDisklabel(void) {return (state == bsd);}
+      int IsDisklabel(void);
 
       // Functions to extract data on specific partitions....
       uint8_t GetType(int i);