OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make it possible to dynamically create and close multiple libhb instances
[handbrake-jp/handbrake-jp-git.git]
/
gtk
/
src
/
values.c
diff --git
a/gtk/src/values.c
b/gtk/src/values.c
index
a888d0a
..
17319a5
100644
(file)
--- a/
gtk/src/values.c
+++ b/
gtk/src/values.c
@@
-15,6
+15,7
@@
#include <glib.h>
#include <glib-object.h>
#include <string.h>
#include <glib.h>
#include <glib-object.h>
#include <string.h>
+#include <inttypes.h>
#include "values.h"
static void dict_delete_key(gpointer data);
#include "values.h"
static void dict_delete_key(gpointer data);
@@
-96,7
+97,7
@@
debug_show_value(GValue *gval)
}
else if (tp == G_TYPE_INT64)
{
}
else if (tp == G_TYPE_INT64)
{
- g_message("Type %s value %
ld"
, "int64", g_value_get_int64(gval));
+ g_message("Type %s value %
" PRId64
, "int64", g_value_get_int64(gval));
}
else if (tp == G_TYPE_DOUBLE)
{
}
else if (tp == G_TYPE_DOUBLE)
{
@@
-252,6
+253,10
@@
ghb_value_cmp(const GValue *vala, const GValue *valb)
GType typa;
GType typb;
GType typa;
GType typb;
+ if ((vala == NULL && valb != NULL) || (vala != NULL && valb == NULL))
+ {
+ return 1;
+ }
typa = G_VALUE_TYPE(vala);
typb = G_VALUE_TYPE(valb);
if (typa != typb)
typa = G_VALUE_TYPE(vala);
typb = G_VALUE_TYPE(valb);
if (typa != typb)