Merged Pull Request '#36 make-clib-amalgamable->main : Guard conflict…

…ing statics'

Guard conflicting statics

component.c

@@ -24,7 +24,7 @@
 
 #include "fiftyone.h"
 
-static uint32_t getFinalSize(void *initial) {
+static uint32_t getFinalComponentSize(void *initial) {
 	Component *component = (Component*)initial;
 	int32_t trailing = (component->keyValuesCount - 1) * sizeof(fiftyoneDegreesComponentKeyValuePair);
 	return (uint32_t)(sizeof(Component) + trailing);
@@ -89,7 +89,7 @@ void* fiftyoneDegreesComponentReadFromFile(
 		offset,
 		&component,
 		sizeof(Component) - sizeof(fiftyoneDegreesComponentKeyValuePair),
-		getFinalSize,
+		getFinalComponentSize,
 		exception);
 }
 
@@ -117,8 +117,8 @@ void fiftyoneDegreesComponentInitList(
 				ListAdd(list, &item);
 
 				// Move to the next component in the collection.
-				offset += getFinalSize((void*)component);
+				offset += getFinalComponentSize((void*)component);
 			}
 		}
 	}
-}
+}

profile.c

@@ -25,7 +25,7 @@
 
 MAP_TYPE(Collection)
 
-static uint32_t getFinalSize(void *initial) {
+static uint32_t getFinalProfileSize(void *initial) {
 	Profile *profile = (Profile*)initial;
 	return sizeof(Profile) +
 		(profile->valueCount * sizeof(uint32_t));
@@ -238,7 +238,7 @@ void* fiftyoneDegreesProfileReadFromFile(
 		offset,
 		&profile,
 		sizeof(Profile),
-		getFinalSize,
+		getFinalProfileSize,
 		exception);
 }
 

property.c

@@ -25,13 +25,16 @@
 
 MAP_TYPE(Collection)
 
-static String* getString(
+#ifndef FIFTYONE_DEGREES_GET_STRING_DEFINED
+#define FIFTYONE_DEGREES_GET_STRING_DEFINED
+static fiftyoneDegreesString* getString(
 	Collection *stringsCollection,
 	uint32_t offset,
 	Item *item,
 	Exception *exception) {
 	return StringGet(stringsCollection, offset, item, exception);
 }
+#endif
 
 fiftyoneDegreesString* fiftyoneDegreesPropertyGetName(
 	fiftyoneDegreesCollection *stringsCollection,

string.c

@@ -24,7 +24,7 @@
 
 #include "fiftyone.h"
 
-static uint32_t getFinalSize(void *initial) {
+static uint32_t getFinalStringSize(void *initial) {
 	return (uint32_t)(sizeof(int16_t) + (*(int16_t*)initial));
 }
 
@@ -42,7 +42,7 @@ void* fiftyoneDegreesStringRead(
 		offset,
 		&length, 
 		sizeof(int16_t),
-		getFinalSize,
+		getFinalStringSize,
 		exception);
 }
 

value.c

@@ -31,13 +31,16 @@ typedef struct value_search_t {
 	const char *valueName;
 } valueSearch;
 
+#ifndef FIFTYONE_DEGREES_GET_STRING_DEFINED
+#define FIFTYONE_DEGREES_GET_STRING_DEFINED
 static fiftyoneDegreesString* getString(
 	Collection *strings,
 	uint32_t offset,
 	Item *item,
 	Exception *exception) {
 	return StringGet(strings, offset, item, exception);
 }
+#endif
 
 /*
  * Function that compare the current String item