diff --git a/src/pw3270/v3270ft/Makefile.in b/src/pw3270/v3270ft/Makefile.in index ee4f0ff..3b50859 100644 --- a/src/pw3270/v3270ft/Makefile.in +++ b/src/pw3270/v3270ft/Makefile.in @@ -28,8 +28,8 @@ MODULE_NAME=v3270ft #---[ Application sources ]-------------------------------------------------------------- -SOURCES=filelist.c load.c misc.c select.c transfer.c v3270ftprogress.c get.c \ - marshal.c save.c set.c v3270ft.c tables.c +SOURCES=marshal.c filelist.c load.c misc.c select.c transfer.c v3270ftprogress.c \ + get.c save.c set.c v3270ft.c tables.c #---[ Configuration values ]------------------------------------------------------------- @@ -161,7 +161,7 @@ marshal.c: \ @echo $(notdir $<) ... @$(MKDIR) `dirname $@` - @$(GENMARSHAL) --prefix=$(MODULE_NAME) --header $< > $@ + @$(GENMARSHAL) --prefix=$(MODULE_NAME) --body $< > $@ #---[ Targets ]-------------------------------------------------------------------------- @@ -184,4 +184,7 @@ cleanDebug: clean clean: @rm -fr $(BINDIR) @rm -fr $(OBJDIR) + @rm -f marshal.h + @rm -f marshal.c + diff --git a/src/pw3270/v3270ft/marshal.c b/src/pw3270/v3270ft/marshal.c deleted file mode 100644 index 24fc8ee..0000000 --- a/src/pw3270/v3270ft/marshal.c +++ /dev/null @@ -1,88 +0,0 @@ - -#include - - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_schar (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#define g_marshal_value_peek_variant(v) g_value_get_variant (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* VOID:POINTER,POINTER (genmarshal:1) */ -void -v3270ft_VOID__POINTER_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__POINTER_POINTER) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer data2); - register GMarshalFunc_VOID__POINTER_POINTER callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__POINTER_POINTER) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_pointer (param_values + 1), - g_marshal_value_peek_pointer (param_values + 2), - data2); -} - diff --git a/src/pw3270/v3270ft/marshal.h b/src/pw3270/v3270ft/marshal.h deleted file mode 100644 index d09c4f6..0000000 --- a/src/pw3270/v3270ft/marshal.h +++ /dev/null @@ -1,20 +0,0 @@ - -#ifndef __v3270ft_MARSHAL_H__ -#define __v3270ft_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -/* VOID:POINTER,POINTER (genmarshal:1) */ -extern void v3270ft_VOID__POINTER_POINTER (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -G_END_DECLS - -#endif /* __v3270ft_MARSHAL_H__ */ - diff --git a/winpacket.sh b/winpacket.sh index f408fca..91cf30d 100755 --- a/winpacket.sh +++ b/winpacket.sh @@ -198,6 +198,8 @@ ARCHS="x86_32 x86_64" RUNTIME=1 COMPLETE=1 +find . -exec touch {} \; + trap cleanup INT until [ -z "$1" ] -- libgit2 0.21.2