Index: trunk/ppMerge/src/ppMerge.c
===================================================================
--- trunk/ppMerge/src/ppMerge.c	(revision 7495)
+++ trunk/ppMerge/src/ppMerge.c	(revision 7698)
@@ -21,5 +21,5 @@
 int main(int argc, char **argv)
 {
-    psMemThreadSafety(false);           // Turn off thread safety, for more
+    psMemSetThreadSafety(false);           // Turn off thread safety, for more
     psTimerStart(TIMERNAME);
 
@@ -28,5 +28,5 @@
     // Determine camera, format from header if not already defined
     // Construct camera in preparation for reading
-    pmConfig *config = ppMergeConfig(&argc, argv);
+    pmConfig *config = ppMergeConfig(argc, argv);
 
     // Set various tasks (define optional operations)