luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 07:38:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Warn if no callback. Call callback correctly. (g_io_win32_create_watch):

Browse Source 
2000-12-14  Tor Lillqvist  <tml@iki.fi>

	* giowin32.c (g_io_win32_dispatch): Warn if no callback. Call
	callback correctly.
	(g_io_win32_create_watch): Fix typo.
	(g_io_win32_fd_create_watch): Ditto.
	(g_io_channel_unix_new): If it is a file descriptor (i.e., a Unix
	fd lookalike provided by the C library), call
	g_io_channel_win32_new_fd(). If it is a socket (from WinSock),
	call g_io_cahnnel_win32_new_stream_socket(). Hopefully sockets and
	fds don't overlap. TODO: Implement also datagram sockets.
	(g_io_channel_win32_poll): Call g_main_context_get_poll_func().

	* gcompletion.h: Include <unistd.h> only on Unix. Is this
	inclusion really needed here? OTOH, do include <stddef.h>, for
	size_t.

	* gmessages.c: (Win32) Don't define a function called "write" that
	might clash with the prototype from <io.h>, use a #define.

	* glib.def: Update.

	* gmain.c (g_source_add_poll): Don't return a value from void
	function.
	(g_main_context_get_poll_func): Compile also for non-Win32, as
	presumably was intended. The result var is a GPollFunc, not a
	GPollFunc*. Return the result!

gobject:

 2000-12-14  Tor Lillqvist  <tml@iki.fi>

	* makefile.mingw.in: Update, include parts from Makefile.am to
	build gmarshal.[ch]. Some day, we won't need these separate
	makefiles for Win32 compilation. I hope.

	* makefile.msc.in: Update. No use trying to build gmarshal.[ch]
	here, it would require Unixish tools. MSVC users building from CVS
	sources are out of luck.

	* gobject.def: Update.
This commit is contained in:
Tor Lillqvist
2000-12-14 21:02:20 +00:00
committed by Tor Lillqvist
parent b0baf3db03
commit b74e7d2f47
22 changed files with 428 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gobject/ChangeLog
View File

@@ -1,3 +1,15 @@
2000-12-14 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in: Update, include parts from Makefile.am to
build gmarshal.[ch]. Some day, we won't need these separate
makefiles for Win32 compilation. I hope.
* makefile.msc.in: Update. No use trying to build gmarshal.[ch]
here, it would require Unixish tools. MSVC users building from CVS
sources are out of luck.
* gobject.def: Update.
Wed Dec 13 09:31:26 2000 Tim Janik <timj@gtk.org>
* gparamspecs.[hc]: add G_TYPE_PARAM_BOXED implementation.

10
gobject/gobject.def
View File

@@ -31,21 +31,16 @@ EXPORTS
g_flags_get_value_by_name
g_flags_get_value_by_nick
g_flags_register_static
g_object_class_find_param_spec
g_object_class_install_param
g_object_get
g_object_get_data
g_object_get_param
g_object_get_qdata
g_object_get_valist
g_object_new
g_object_new_valist
g_object_queue_param_changed
g_object_ref
g_object_set
g_object_set_data
g_object_set_data_full
g_object_set_param
g_object_set_qdata
g_object_set_qdata_full
g_object_set_valist
@@ -78,6 +73,7 @@ EXPORTS
g_param_value_validate
g_param_values_cmp
g_signal_connect_closure_by_id
g_signal_connect_object
g_signal_emitv
g_signal_handler_block
g_signal_handler_disconnect
@@ -89,10 +85,10 @@ EXPORTS
g_signal_handlers_unblock_matched
g_signal_lookup
g_signal_name
g_signal_new
g_signal_newv
g_signal_query
g_signal_stop_emission
g_signal_type_closure_new
g_type_add_interface_dynamic
g_type_add_interface_static
g_type_check_class_cast
@@ -104,7 +100,6 @@ EXPORTS
g_type_class_peek_parent
g_type_class_ref
g_type_class_unref
g_type_conforms_to
g_type_create_instance
g_type_free_instance
g_type_from_name
@@ -113,7 +108,6 @@ EXPORTS
g_type_get_plugin
g_type_get_qdata
g_type_init
g_type_instance_conforms_to
g_type_interface_peek
g_type_interfaces
g_type_is_a

36
gobject/makefile.mingw.in
View File

@@ -18,6 +18,8 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
INCLUDES = -I .. -I .
DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_gruntime
srcdir=.
BUILD_DLL = ../build-dll
all : \
@@ -26,7 +28,8 @@ all : \
makefile.mingw: makefile.mingw.in
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@,' \
-e 's,@RE[B]UILD@,,' <$< >$@
gobject_OBJECTS = \
gboxed.o \
@@ -47,4 +50,33 @@ gobject-$(GLIB_VER).dll : $(gobject_OBJECTS) gobject.def
$(BUILD_DLL) gobject $(GLIB_VER) gobject.def $(gobject_OBJECTS) -L .. -lglib-$(GLIB_VER)
glib-genmarshal.exe : glib-genmarshal.c
$(CC) -o $@ $(CFLAGS) -UGOBJECT_COMPILATION -DG_LOG_DOMAIN=\"glib-genmarshal\" $< -L .. -lglib-$(GLIB_VER) -L . -lgobject-$(GLIB_VER)
$(CC) -o $@ $(CFLAGS) -UGOBJECT_COMPILATION $< -L .. -lglib-$(GLIB_VER) -L . -lgobject-$(GLIB_VER)
# Copied from Makefile.am:
# initial creation of the real stamp-* files
gmarshal.h: # never add deps here
test -f "$(srcdir)/$@" || touch $(srcdir)/$@
# normal autogeneration rules
# all autogenerated files need to be generated in the srcdir,
# so old versions get remade and are not confused with newer
# versions in the build dir. thus a development setup requires
# srcdir to be writable, passing --disable-rebuilds to
# ../configure will supress all autogeneration rules.
$(srcdir)/stamp-gmarshal.h: @REBUILD@ gmarshal.list gmarshal.h glib-genmarshal.exe
echo "#ifndef __G_MARSHAL_H__" > xgen-gmh \
&& echo "#define __G_MARSHAL_H__" >> xgen-gmh \
&& ./glib-genmarshal --nostdinc --prefix=g_cclosure_marshal $(srcdir)/gmarshal.list --header >> xgen-gmh \
&& echo "#endif /* __G_MARSHAL_H__ */" >> xgen-gmh \
&& (cmp -s xgen-gmh $(srcdir)/gmarshal.h || cp xgen-gmh $(srcdir)/gmarshal.h) \
&& rm -f xgen-gmh xgen-gmh~ \
&& echo timestamp > $@
$(srcdir)/gmarshal.c: @REBUILD@ $(srcdir)/stamp-gmarshal.h
./glib-genmarshal --nostdinc --prefix=g_cclosure_marshal $(srcdir)/gmarshal.list --body >> xgen-gmc \
&& cp xgen-gmc $(srcdir)/gmarshal.c \
&& rm -f xgen-gmc xgen-gmc~
$(srcdir)/gmarshal.strings: @REBUILD@ $(srcdir)/gmarshal.list
grep '^[A-Z]' $(srcdir)/gmarshal.list \
| sed -e 's/^/"g_cclosure_marshal_/' -e 's/:/__/' -e 's/,/_/g' -e 's/$$/",/' > xgen-gms \
&& cp xgen-gms $(srcdir)/gmarshal.strings \
&& rm -f xgen-gms xgen-gms~
glib-genmarshal.o: gmarshal.strings

3
gobject/makefile.msc.in
View File

@@ -24,6 +24,7 @@ gobject_OBJECTS = \
gbsearcharray.obj \
gclosure.obj \
genums.obj \
gmarshal.obj \
gobject.obj \
gparam.obj \
gparamspecs.obj \
@@ -42,4 +43,4 @@ gobject-$(GLIB_VER).dll : $(gobject_OBJECTS) gobject.def
$(CC) $(CFLAGS) -LD -Fegobject-$(GLIB_VER).dll $(gobject_OBJECTS) ..\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gobject.def
glib-genmarshal.exe : glib-genmarshal.c
$(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION -DG_LOG_DOMAIN=\"glib-genmarshal\" glib-genmarshal.c ..\glib-$(GLIB_VER).lib gobject-$(GLIB_VER).lib
$(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c ..\glib-$(GLIB_VER).lib gobject-$(GLIB_VER).lib