Changeset 1211

Timestamp:

06/25/11 06:40:30 (2 years ago)

Author:

reyalp

Message:

fix raw merge on some dryos < R39

File:

• trunk/core/raw_merge.c (modified) (2 diffs)

trunk/core/raw_merge.c

@@ -8 +8 @@
 #include "lang.h"
 #include "conf.h"
-#ifdef CAM_DRYOS_2_3_R39
-  #define TEMP_FILE        "A/raw16.tmp"
-#else
-  #define TEMP_FILE        "raw16.tmp"
-#endif
 #define TEMP_FILE_NAME   "A/raw16.tmp"
 #define TEMP_FILE_NAME_1 "A/raw16_1.tmp"
@@ -290 +285 @@
   } 
   remove(TEMP_FILE_NAME);
-  rename(TEMP_FILE_NAME_1,TEMP_FILE);
+  rename(TEMP_FILE_NAME_1,TEMP_FILE_NAME);
   finished();
 }