Download as
Browse Code »

Commit c9e7e91ade223a7d1a30eb9251e569ad848a456e

Authored by Perry Werneck
1 parent 8edf998f
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Corrigindo erro no empacotamento windows.

Showing 4 changed files with 8 additions and 111 deletions   Show diff stats
src/pw3270/v3270ft/Makefile.in
  Diff comments   View file @c9e7e91
... ... @@ -28,8 +28,8 @@ MODULE_NAME=v3270ft
28 28  
29 29 #---[ Application sources ]--------------------------------------------------------------
30 30  
31   -SOURCES=filelist.c load.c misc.c select.c transfer.c v3270ftprogress.c get.c \
32   - marshal.c save.c set.c v3270ft.c tables.c
  31 +SOURCES=marshal.c filelist.c load.c misc.c select.c transfer.c v3270ftprogress.c \
  32 + get.c save.c set.c v3270ft.c tables.c
33 33  
34 34 #---[ Configuration values ]-------------------------------------------------------------
35 35  
... ... @@ -161,7 +161,7 @@ marshal.c: \
161 161  
162 162 @echo $(notdir $<) ...
163 163 @$(MKDIR) `dirname $@`
164   - @$(GENMARSHAL) --prefix=$(MODULE_NAME) --header $< > $@
  164 + @$(GENMARSHAL) --prefix=$(MODULE_NAME) --body $< > $@
165 165  
166 166 #---[ Targets ]--------------------------------------------------------------------------
167 167  
... ... @@ -184,4 +184,7 @@ cleanDebug: clean
184 184 clean:
185 185 @rm -fr $(BINDIR)
186 186 @rm -fr $(OBJDIR)
  187 + @rm -f marshal.h
  188 + @rm -f marshal.c
  189 +
187 190  
... ...
src/pw3270/v3270ft/marshal.c
View file @8edf998
... ... @@ -1,88 +0,0 @@
1   -
2   -#include <glib-object.h>
3   -
4   -
5   -#ifdef G_ENABLE_DEBUG
6   -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
7   -#define g_marshal_value_peek_char(v) g_value_get_schar (v)
8   -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
9   -#define g_marshal_value_peek_int(v) g_value_get_int (v)
10   -#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
11   -#define g_marshal_value_peek_long(v) g_value_get_long (v)
12   -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)
13   -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)
14   -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)
15   -#define g_marshal_value_peek_enum(v) g_value_get_enum (v)
16   -#define g_marshal_value_peek_flags(v) g_value_get_flags (v)
17   -#define g_marshal_value_peek_float(v) g_value_get_float (v)
18   -#define g_marshal_value_peek_double(v) g_value_get_double (v)
19   -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
20   -#define g_marshal_value_peek_param(v) g_value_get_param (v)
21   -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
22   -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
23   -#define g_marshal_value_peek_object(v) g_value_get_object (v)
24   -#define g_marshal_value_peek_variant(v) g_value_get_variant (v)
25   -#else /* !G_ENABLE_DEBUG */
26   -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
27   - * Do not access GValues directly in your code. Instead, use the
28   - * g_value_get_*() functions
29   - */
30   -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int
31   -#define g_marshal_value_peek_char(v) (v)->data[0].v_int
32   -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint
33   -#define g_marshal_value_peek_int(v) (v)->data[0].v_int
34   -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint
35   -#define g_marshal_value_peek_long(v) (v)->data[0].v_long
36   -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
37   -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
38   -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
39   -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
40   -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
41   -#define g_marshal_value_peek_float(v) (v)->data[0].v_float
42   -#define g_marshal_value_peek_double(v) (v)->data[0].v_double
43   -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
44   -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer
45   -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
46   -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
47   -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
48   -#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer
49   -#endif /* !G_ENABLE_DEBUG */
50   -
51   -
52   -/* VOID:POINTER,POINTER (genmarshal:1) */
53   -void
54   -v3270ft_VOID__POINTER_POINTER (GClosure *closure,
55   - GValue *return_value G_GNUC_UNUSED,
56   - guint n_param_values,
57   - const GValue *param_values,
58   - gpointer invocation_hint G_GNUC_UNUSED,
59   - gpointer marshal_data)
60   -{
61   - typedef void (*GMarshalFunc_VOID__POINTER_POINTER) (gpointer data1,
62   - gpointer arg_1,
63   - gpointer arg_2,
64   - gpointer data2);
65   - register GMarshalFunc_VOID__POINTER_POINTER callback;
66   - register GCClosure *cc = (GCClosure*) closure;
67   - register gpointer data1, data2;
68   -
69   - g_return_if_fail (n_param_values == 3);
70   -
71   - if (G_CCLOSURE_SWAP_DATA (closure))
72   - {
73   - data1 = closure->data;
74   - data2 = g_value_peek_pointer (param_values + 0);
75   - }
76   - else
77   - {
78   - data1 = g_value_peek_pointer (param_values + 0);
79   - data2 = closure->data;
80   - }
81   - callback = (GMarshalFunc_VOID__POINTER_POINTER) (marshal_data ? marshal_data : cc->callback);
82   -
83   - callback (data1,
84   - g_marshal_value_peek_pointer (param_values + 1),
85   - g_marshal_value_peek_pointer (param_values + 2),
86   - data2);
87   -}
88   -
src/pw3270/v3270ft/marshal.h
View file @8edf998
... ... @@ -1,20 +0,0 @@
1   -
2   -#ifndef __v3270ft_MARSHAL_H__
3   -#define __v3270ft_MARSHAL_H__
4   -
5   -#include <glib-object.h>
6   -
7   -G_BEGIN_DECLS
8   -
9   -/* VOID:POINTER,POINTER (genmarshal:1) */
10   -extern void v3270ft_VOID__POINTER_POINTER (GClosure *closure,
11   - GValue *return_value,
12   - guint n_param_values,
13   - const GValue *param_values,
14   - gpointer invocation_hint,
15   - gpointer marshal_data);
16   -
17   -G_END_DECLS
18   -
19   -#endif /* __v3270ft_MARSHAL_H__ */
20   -
winpacket.sh
  Diff comments   View file @c9e7e91
... ... @@ -198,6 +198,8 @@ ARCHS=&quot;x86_32 x86_64&quot;
198 198 RUNTIME=1
199 199 COMPLETE=1
200 200  
  201 +find . -exec touch {} \;
  202 +
201 203 trap cleanup INT
202 204  
203 205 until [ -z "$1" ]
... ...