mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-06-02 02:40:07 +02:00
Fix gccisms (pointer arithmetic on void pointer, label without statement
2000-10-26 Tor Lillqvist <tml@iki.fi> * gbsearcharray.c (bsearch_array_insert): Fix gccisms (pointer arithmetic on void pointer, label without statement following. * gtype.c (type_node_fundamental_info): Don't apply unary minus to result of sizeof operator, it can be unsigned. Cast first to gssize. * gobject.def: Add new functions. * makefile.{mingw,msc}.in: Add new objects.
This commit is contained in:
parent
6f83e76ea8
commit
f42bc93186
@ -90,10 +90,11 @@ bsearch_array_insert (GBSearchArray *barray,
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
barray->nodes = g_realloc (barray->nodes, barray->n_nodes * sizeof_node);
|
barray->nodes = g_realloc (barray->nodes, barray->n_nodes * sizeof_node);
|
||||||
check = barray->nodes + i * sizeof_node;
|
check = (char *) barray->nodes + i * sizeof_node;
|
||||||
g_memmove (check + sizeof_node, check, (n_nodes - i) * sizeof_node);
|
g_memmove (check + sizeof_node, check, (n_nodes - i) * sizeof_node);
|
||||||
replace = TRUE;
|
replace = TRUE;
|
||||||
SKIP_GROW:
|
SKIP_GROW:
|
||||||
|
;
|
||||||
}
|
}
|
||||||
if (replace)
|
if (replace)
|
||||||
memcpy (check, key_node, sizeof_node);
|
memcpy (check, key_node, sizeof_node);
|
||||||
|
@ -1,3 +1,16 @@
|
|||||||
|
2000-10-26 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
|
* gbsearcharray.c (bsearch_array_insert): Fix gccisms (pointer
|
||||||
|
arithmetic on void pointer, label without statement following.
|
||||||
|
|
||||||
|
* gtype.c (type_node_fundamental_info): Don't apply unary minus to
|
||||||
|
result of sizeof operator, it can be unsigned. Cast first to
|
||||||
|
gssize.
|
||||||
|
|
||||||
|
* gobject.def: Add new functions.
|
||||||
|
|
||||||
|
* makefile.{mingw,msc}.in: Add new objects.
|
||||||
|
|
||||||
2000-10-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
2000-10-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||||
|
|
||||||
* Makefile.am: Remove empty SUBDIRS line _again_, as that _still_
|
* Makefile.am: Remove empty SUBDIRS line _again_, as that _still_
|
||||||
|
@ -90,10 +90,11 @@ bsearch_array_insert (GBSearchArray *barray,
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
barray->nodes = g_realloc (barray->nodes, barray->n_nodes * sizeof_node);
|
barray->nodes = g_realloc (barray->nodes, barray->n_nodes * sizeof_node);
|
||||||
check = barray->nodes + i * sizeof_node;
|
check = (char *) barray->nodes + i * sizeof_node;
|
||||||
g_memmove (check + sizeof_node, check, (n_nodes - i) * sizeof_node);
|
g_memmove (check + sizeof_node, check, (n_nodes - i) * sizeof_node);
|
||||||
replace = TRUE;
|
replace = TRUE;
|
||||||
SKIP_GROW:
|
SKIP_GROW:
|
||||||
|
;
|
||||||
}
|
}
|
||||||
if (replace)
|
if (replace)
|
||||||
memcpy (check, key_node, sizeof_node);
|
memcpy (check, key_node, sizeof_node);
|
||||||
|
@ -1,4 +1,24 @@
|
|||||||
EXPORTS
|
EXPORTS
|
||||||
|
g_boxed_copy
|
||||||
|
g_boxed_free
|
||||||
|
g_boxed_type_register_static
|
||||||
|
g_bsearch_array_insert
|
||||||
|
g_bsearch_array_remove
|
||||||
|
g_bsearch_array_remove_node
|
||||||
|
g_cclosure_new
|
||||||
|
g_cclosure_new_swap
|
||||||
|
g_closure_add_fnotify
|
||||||
|
g_closure_add_inotify
|
||||||
|
g_closure_add_marshal_guards
|
||||||
|
g_closure_invalidate
|
||||||
|
g_closure_invoke
|
||||||
|
g_closure_new_simple
|
||||||
|
g_closure_ref
|
||||||
|
g_closure_remove_fnotify
|
||||||
|
g_closure_remove_inotify
|
||||||
|
g_closure_set_marshal
|
||||||
|
g_closure_set_meta_marshal
|
||||||
|
g_closure_unref
|
||||||
g_enum_complete_type_info
|
g_enum_complete_type_info
|
||||||
g_enum_get_value
|
g_enum_get_value
|
||||||
g_enum_get_value_by_name
|
g_enum_get_value_by_name
|
||||||
@ -50,6 +70,20 @@ EXPORTS
|
|||||||
g_param_value_set_default
|
g_param_value_set_default
|
||||||
g_param_value_validate
|
g_param_value_validate
|
||||||
g_param_values_cmp
|
g_param_values_cmp
|
||||||
|
g_signal_connect_closure
|
||||||
|
g_signal_emitv
|
||||||
|
g_signal_handler_block
|
||||||
|
g_signal_handler_disconnect
|
||||||
|
g_signal_handler_find
|
||||||
|
g_signal_handler_unblock
|
||||||
|
g_signal_handlers_destroy
|
||||||
|
g_signal_lookup
|
||||||
|
g_signal_name
|
||||||
|
g_signal_newv
|
||||||
|
g_signal_query
|
||||||
|
g_signal_stop_emission
|
||||||
|
g_signal_type_closure_new
|
||||||
|
g_signals_destroy
|
||||||
g_type_add_interface_dynamic
|
g_type_add_interface_dynamic
|
||||||
g_type_add_interface_static
|
g_type_add_interface_static
|
||||||
g_type_check_class_cast
|
g_type_check_class_cast
|
||||||
@ -65,8 +99,8 @@ EXPORTS
|
|||||||
g_type_create_instance
|
g_type_create_instance
|
||||||
g_type_free_instance
|
g_type_free_instance
|
||||||
g_type_from_name
|
g_type_from_name
|
||||||
g_type_fundamental_last
|
|
||||||
g_type_fundamental_branch_last
|
g_type_fundamental_branch_last
|
||||||
|
g_type_fundamental_last
|
||||||
g_type_get_plugin
|
g_type_get_plugin
|
||||||
g_type_get_qdata
|
g_type_get_qdata
|
||||||
g_type_init
|
g_type_init
|
||||||
@ -84,9 +118,11 @@ EXPORTS
|
|||||||
g_type_set_qdata
|
g_type_set_qdata
|
||||||
g_value_convert
|
g_value_convert
|
||||||
g_value_copy
|
g_value_copy
|
||||||
|
g_value_dup_boxed
|
||||||
g_value_dup_object
|
g_value_dup_object
|
||||||
g_value_dup_string
|
g_value_dup_string
|
||||||
g_value_get_boolean
|
g_value_get_boolean
|
||||||
|
g_value_get_boxed
|
||||||
g_value_get_char
|
g_value_get_char
|
||||||
g_value_get_double
|
g_value_get_double
|
||||||
g_value_get_enum
|
g_value_get_enum
|
||||||
@ -102,6 +138,7 @@ EXPORTS
|
|||||||
g_value_init
|
g_value_init
|
||||||
g_value_reset
|
g_value_reset
|
||||||
g_value_set_boolean
|
g_value_set_boolean
|
||||||
|
g_value_set_boxed
|
||||||
g_value_set_char
|
g_value_set_char
|
||||||
g_value_set_double
|
g_value_set_double
|
||||||
g_value_set_enum
|
g_value_set_enum
|
||||||
@ -110,6 +147,7 @@ EXPORTS
|
|||||||
g_value_set_int
|
g_value_set_int
|
||||||
g_value_set_long
|
g_value_set_long
|
||||||
g_value_set_object
|
g_value_set_object
|
||||||
|
g_value_set_static_boxed
|
||||||
g_value_set_string
|
g_value_set_string
|
||||||
g_value_set_uchar
|
g_value_set_uchar
|
||||||
g_value_set_uint
|
g_value_set_uint
|
||||||
|
@ -289,7 +289,7 @@ type_node_fundamental_info (TypeNode *node)
|
|||||||
if (ftype != NODE_TYPE (node))
|
if (ftype != NODE_TYPE (node))
|
||||||
node = LOOKUP_TYPE_NODE (ftype);
|
node = LOOKUP_TYPE_NODE (ftype);
|
||||||
|
|
||||||
return node ? G_STRUCT_MEMBER_P (node, - sizeof (GTypeFundamentalInfo)) : NULL;
|
return node ? G_STRUCT_MEMBER_P (node, - (gssize) sizeof (GTypeFundamentalInfo)) : NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static TypeNode*
|
static TypeNode*
|
||||||
|
@ -27,14 +27,18 @@ makefile.mingw: makefile.mingw.in
|
|||||||
sed -e 's,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@,' \
|
sed -e 's,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@,' \
|
||||||
-e 's,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@,' <$< >$@
|
-e 's,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@,' <$< >$@
|
||||||
|
|
||||||
gobject_OBJECTS = \
|
gobject_OBJECTS = \
|
||||||
gvalue.o \
|
gboxed.o \
|
||||||
gvaluetypes.o \
|
gbsearcharray.o \
|
||||||
gparam.o \
|
gclosure.o \
|
||||||
gparamspecs.o \
|
genums.o \
|
||||||
genums.o \
|
gobject.o \
|
||||||
gobject.o \
|
gparam.o \
|
||||||
gtype.o
|
gparamspecs.o \
|
||||||
|
gsignal.o \
|
||||||
|
gtype.o \
|
||||||
|
gvalue.o \
|
||||||
|
gvaluetypes.o
|
||||||
|
|
||||||
gobject-$(GLIB_VER).dll : $(gobject_OBJECTS) gobject.def
|
gobject-$(GLIB_VER).dll : $(gobject_OBJECTS) gobject.def
|
||||||
$(BUILD_DLL) gobject $(GLIB_VER) gobject.def $(gobject_OBJECTS) -L .. -lglib-$(GLIB_VER)
|
$(BUILD_DLL) gobject $(GLIB_VER) gobject.def $(gobject_OBJECTS) -L .. -lglib-$(GLIB_VER)
|
||||||
|
@ -18,14 +18,18 @@ DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_gobj
|
|||||||
all : \
|
all : \
|
||||||
gobject-$(GLIB_VER).dll
|
gobject-$(GLIB_VER).dll
|
||||||
|
|
||||||
gobject_OBJECTS = \
|
gobject_OBJECTS = \
|
||||||
gvalue.obj \
|
gboxed.obj \
|
||||||
gvaluetypes.obj \
|
gbsearcharray.obj \
|
||||||
gparam.obj \
|
gclosure.obj \
|
||||||
gparamspecs.obj \
|
genums.obj \
|
||||||
genums.obj \
|
gobject.obj \
|
||||||
gobject.obj \
|
gparam.obj \
|
||||||
gtype.obj
|
gparamspecs.obj \
|
||||||
|
gsignal.obj \
|
||||||
|
gtype.obj \
|
||||||
|
gvalue.obj \
|
||||||
|
gvaluetypes.obj
|
||||||
|
|
||||||
makefile.msc: makefile.msc.in
|
makefile.msc: makefile.msc.in
|
||||||
$(SED) -e s,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@, \
|
$(SED) -e s,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@, \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user