Fix OSX conversion issues

Author: dinikolop

libhdt/src/libdcs/CSD_PFC.cpp

@@ -302,7 +302,11 @@ size_t CSD_PFC::load(unsigned char *ptr, unsigned char *ptrMax) {
 	if(ptr[count++] != PFC)
 		throw std::runtime_error("Trying to read a CSD_PFC but type does not match");
 
-	count += VByte::decode(&ptr[count], ptrMax, &numstrings);
+	if(sizeof(numstrings) == 8)
+		count += VByte::decode(&ptr[count], ptrMax, (uint64_t*) &numstrings);
+	else
+		count += VByte::decode(&ptr[count], ptrMax, (uint32_t*) &numstrings);
+
 	count += VByte::decode(&ptr[count], ptrMax, &bytes);
 	count += VByte::decode(&ptr[count], ptrMax, &blocksize);
 
@@ -541,7 +545,10 @@ void CSD_PFC::fillSuggestions(const char *base, vector<std::string> &out, int ma
 		while ( (idInBlock<blocksize) && (pos<bytes) && !terminate)
 		{
 			// Decode the prefix
-			pos += VByte::decode(text+pos, text+bytes, &delta);
+			if(sizeof(delta) == 8)
+				pos += VByte::decode(text+pos, text+bytes, (uint64_t*) &delta);
+			else
+				pos += VByte::decode(text+pos, text+bytes, (uint32_t*) &delta);
 
 			// Guess suffix size
 			slen = strlen((char*)text+pos)+1;

libhdt/src/libdcs/CSD_PFC.h

@@ -261,7 +261,10 @@ class PFCSuggestionIterator: public hdt::IteratorUCharString {
 
 		while (((idInBlock < pfc->blocksize) && (pos < pfc->bytes) && !terminate) && !hasNext()) {
 			// Decode the prefix
-			pos += VByte::decode(pfc->text + pos, pfc->text + pfc->bytes, &delta);
+            if(sizeof(delta) == 8)
+                pos += VByte::decode(pfc->text + pos, pfc->text + pfc->bytes, (uint64_t*) &delta);
+            else
+                pos += VByte::decode(pfc->text + pos, pfc->text + pfc->bytes, (uint32_t*) &delta);
 
 			// Guess suffix size
 			slen = strlen((char*) pfc->text + pos) + 1;
@@ -395,7 +398,10 @@ class PFCSuggestionIDIterator: public hdt::IteratorUInt {
 
 		while (((idInBlock < pfc->blocksize) && (pos < pfc->bytes) && !terminate) && !hasNext()) {
 			// Decode the prefix
-			pos += VByte::decode(pfc->text + pos, pfc->text + pfc->bytes, &delta);
+            if(sizeof(delta) == 8)
+                pos += VByte::decode(pfc->text + pos, pfc->text + pfc->bytes, (uint64_t*) &delta);
+            else
+                pos += VByte::decode(pfc->text + pos, pfc->text + pfc->bytes, (uint32_t*) &delta);
 
 			// Guess suffix size
 			slen = strlen((char*) pfc->text + pos) + 1;