Attachment #26379 for bug #42959

Lines 46-51 Link Here

(-)anjuta-1.2.1.old/src/anjuta.h (+4 lines)
46	#include "file_history.h"	46	#include "file_history.h"
47	#include "launcher.h"	47	#include "launcher.h"
48		48
		49	/* define this if you want anjuta to use cmp to
		50	compare files */
		51	#undef USE_CMP
		52
49	#define g_strdup_printfs2(_FORMAT_, _STR_) \	53	#define g_strdup_printfs2(_FORMAT_, _STR_) \
50	{ \	54	{ \
51	assert(_STR_); g_strdup_printf(_FORMAT_, _STR_); \	55	assert(_STR_); g_strdup_printf(_FORMAT_, _STR_); \





	g_return_val_if_fail (src != NULL, FALSE);
	g_return_val_if_fail (dest != NULL, FALSE);
#ifdef USE_CMP
	if (anjuta_is_installed ("cmp", FALSE) == TRUE)
	{
		pid_t pid;

	}
	else
	{
#endif
		same = FALSE;
#ifdef USE_CMP
	}
#endif
	/* rename () can't work with 2 different filesystems, so we need
	 to use the couple {copy, remove}. Meanwhile, the files to copy
	 are supposed to be small, so it would spend more time to try 

Return to bug 42959

Lines 1212-1218 Link Here

(-)anjuta-1.2.1.old/src/utilities.c (-1 / +4 lines)
1212		1212
1213	g_return_val_if_fail (src != NULL, FALSE);	1213	g_return_val_if_fail (src != NULL, FALSE);
1214	g_return_val_if_fail (dest != NULL, FALSE);	1214	g_return_val_if_fail (dest != NULL, FALSE);
1215		1215	#ifdef USE_CMP
1216	if (anjuta_is_installed ("cmp", FALSE) == TRUE)	1216	if (anjuta_is_installed ("cmp", FALSE) == TRUE)
1217	{	1217	{
1218	pid_t pid;	1218	pid_t pid;
Lines 1230-1237 Link Here
1230	}	1230	}
1231	else	1231	else
1232	{	1232	{
		1233	#endif
1233	same = FALSE;	1234	same = FALSE;
		1235	#ifdef USE_CMP
1234	}	1236	}
		1237	#endif
1235	/* rename () can't work with 2 different filesystems, so we need	1238	/* rename () can't work with 2 different filesystems, so we need
1236	to use the couple {copy, remove}. Meanwhile, the files to copy	1239	to use the couple {copy, remove}. Meanwhile, the files to copy
1237	are supposed to be small, so it would spend more time to try	1240	are supposed to be small, so it would spend more time to try