Reverted changes in fields of MCCustomPrinterDocument so as to compile on Linux

livecodepanos · livecodepanos · commit 6bcf2e54f9d4 · 2013-11-20T13:46:01.000Z
diff --git a/engine/include/customprinter.h b/engine/include/customprinter.h
@@ -39,8 +39,8 @@ struct MCCustomPrinterDocument
 	const char *filename;
 
 	uint32_t option_count;
-	MCStringRef const *option_keys;
-	MCStringRef const *option_values;
+	char * const *option_keys;
+	char * const *option_values;
 };
 
 struct MCCustomPrinterPage
diff --git a/engine/src/customprinter.cpp b/engine/src/customprinter.cpp
@@ -1127,22 +1127,22 @@ const char *MCCustomPrinterDevice::Error(void) const
 struct convert_options_array_t
 {
 	uindex_t index;
-	MCStringRef *option_keys;
-	MCStringRef *option_values;
+	char **option_keys;
+	char **option_values;
 };
 
 static bool convert_options_array(void *p_context, MCArrayRef p_array, MCNameRef p_key, MCValueRef p_value)
 {
 	convert_options_array_t *ctxt;
 	ctxt = (convert_options_array_t *)p_context;
 
-	if (!MCStringCopy(MCNameGetString(p_key), ctxt -> option_keys[ctxt -> index]))
+	if (!MCStringConvertToCString(MCNameGetString(p_key), ctxt -> option_keys[ctxt -> index]))
 		return false;
 	
     if (MCValueGetTypeCode(p_value) != kMCValueTypeCodeString)
 		return false;
 	
-	if (!MCStringCopy((MCStringRef)p_value, ctxt -> option_values[ctxt -> index]))
+	if (!MCStringConvertToCString((MCStringRef)p_value, ctxt -> option_values[ctxt -> index]))
 		return false;
 	
 	ctxt -> index += 1;
@@ -1164,7 +1164,7 @@ MCPrinterResult MCCustomPrinterDevice::Start(const char *p_title, MCArrayRef p_o
 	t_document . filename = MCprinter -> GetDeviceOutputLocation();
 
 	// Extract the option strings
-	MCStringRef *t_option_keys, *t_option_values;
+	char **t_option_keys, **t_option_values;
 	uint32_t t_option_count;
 	t_option_keys = t_option_values = nil;
 	t_option_count = 0;
