dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make it compile without warnings also with gcc -Wwrite-strings. Use 

2008-09-04  Tor Lillqvist  <tml@novell.com>

	* tools/gimptool.c: Make it compile without warnings also with gcc
	-Wwrite-strings. Use cmd.exe instead of command.com to execute the
	COPY and DEL commands on Windows.


svn path=/trunk/; revision=26865
This commit is contained in:
Tor Lillqvist 2008-09-04 17:46:51 +00:00 committed by Tor Lillqvist
parent 05e7e9dc54
commit c68265e09c
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-09-04 Tor Lillqvist <tml@novell.com>
* tools/gimptool.c: Make it compile without warnings also with gcc
-Wwrite-strings. Use cmd.exe instead of command.com to execute the
COPY and DEL commands on Windows.
2008-09-04 Sven Neumann <sven@gimp.org>
* app/display/gimpdisplayshell-dnd.c

29
tools/gimptool.c
View File

@ -92,12 +92,12 @@ static struct {
#ifdef G_OS_WIN32
static gchar *
win32_command (gchar *command)
win32_command (const gchar *command)
{
gchar *comspec = getenv ("COMSPEC");
const gchar *comspec = getenv ("COMSPEC");
if (!comspec)
comspec = "command.com";
comspec = "cmd.exe";
return g_strdup_printf ("%s /c %s", comspec, command);
}
@ -221,20 +221,25 @@ get_exec_prefix (gchar slash)
#endif
}
static gchar *
static const gchar *
expand_and_munge (const gchar *value)
{
const gchar *retval;
if (starts_with_dir (value, "${prefix}"))
value = g_strconcat (PREFIX, value + strlen ("${prefix}"), NULL);
retval = g_strconcat (PREFIX, value + strlen ("${prefix}"), NULL);
else if (starts_with_dir (value, "${exec_prefix}"))
value = g_strconcat (EXEC_PREFIX, value + strlen ("${exec_prefix}"), NULL);
if (starts_with_dir (value, EXEC_PREFIX))
value = g_strconcat (get_exec_prefix ('/'), value + strlen (EXEC_PREFIX), NULL);
retval = g_strconcat (EXEC_PREFIX, value + strlen ("${exec_prefix}"), NULL);
else
retval = g_strdup (value);
if (starts_with_dir (value, PREFIX))
value = g_strconcat (get_runtime_prefix ('/'), value + strlen (PREFIX), NULL);
if (starts_with_dir (retval, EXEC_PREFIX))
retval = g_strconcat (get_exec_prefix ('/'), retval + strlen (EXEC_PREFIX), NULL);
return value;
if (starts_with_dir (retval, PREFIX))
retval = g_strconcat (get_runtime_prefix ('/'), retval + strlen (PREFIX), NULL);
return retval;
}
static void
@ -423,7 +428,7 @@ do_build_2 (const gchar *cflags,
const gchar *what)
{
gchar *cmd;
gchar *dest_dir;
const gchar *dest_dir;
const gchar *output_flag;
gchar *dest_exe;
const gchar *here_comes_linker_flags = "";