Mercurial > mxe-octave

annotate src/msvc-vala-1.patch @ 7207:9ed6500e56d3 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge release to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 17 May 2024 20:16:41 +0200
parents 93dc7f614289
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3133
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur vala-0.20.1-orig/gobject-introspection/gidlnode.c vala-0.20.1/gobject-introspection/gidlnode.c
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- vala-0.20.1-orig/gobject-introspection/gidlnode.c 2009-04-09 16:01:10 -0400
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ vala-0.20.1/gobject-introspection/gidlnode.c 2013-07-12 19:28:27 -0400
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -840,6 +840,11 @@
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 }
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 }
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 +#ifdef _MSC_VER
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 +# define strtoll _strtoi64
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 +# define strtoull _strtoui64
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 +#endif
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 +
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 static gint64
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 parse_int_value (const gchar *str)
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 {
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 diff -ur vala-0.20.1-orig/gobject-introspection/scanner.c vala-0.20.1/gobject-introspection/scanner.c
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 --- vala-0.20.1-orig/gobject-introspection/scanner.c 2012-11-11 08:05:37 -0500
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18 +++ vala-0.20.1/gobject-introspection/scanner.c 2013-07-12 19:15:07 -0400
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19 @@ -775,13 +775,14 @@
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20 member_l = member_l->next)
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21 {
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22 CSymbol *member = member_l->data;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23 + GIdlNodeField *gifield;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
24 /* ignore private / reserved members */
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25 if (member->ident[0] == '_'
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26 || g_str_has_prefix (member->ident, "priv"))
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27 {
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28 continue;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
29 }
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
30 - GIdlNodeField *gifield =
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
31 + gifield =
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
32 (GIdlNodeField *) g_idl_node_new (G_IDL_NODE_FIELD);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
33 node->members = g_list_append (node->members, gifield);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
34 gifield->node.name = member->ident;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35 @@ -943,8 +944,10 @@
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
36
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37 if (union_type->child_list == NULL)
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38 {
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
39 + CSymbol *union_symbol;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
40 +
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
41 g_assert (union_type->name != NULL);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
42 - CSymbol *union_symbol =
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
43 + union_symbol =
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
44 g_hash_table_lookup (igenerator->struct_or_union_or_enum_table,
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
45 union_type->name);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
46 if (union_symbol != NULL)
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
47 @@ -960,9 +963,11 @@
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
48 type = g_hash_table_lookup (igenerator->type_map, sym->ident);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
49 if (type != NULL)
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
50 {
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
51 - g_assert (type->type == G_IDL_NODE_BOXED);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
52 - GIdlNodeBoxed *node = (GIdlNodeBoxed *) type;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
53 + GIdlNodeBoxed *node;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
54 GList *member_l;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
55 +
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
56 + g_assert (type->type == G_IDL_NODE_BOXED);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
57 + node = (GIdlNodeBoxed *) type;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
58 for (member_l = union_type->child_list; member_l != NULL;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
59 member_l = member_l->next)
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
60 {
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
61 @@ -1333,9 +1338,10 @@
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
62 FILE *fmacros =
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
63 fdopen (g_file_open_tmp ("gen-introspect-XXXXXX.h", &tmp_name, &error),
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
64 "w+");
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
65 + GList *l;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
66 +
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
67 g_unlink (tmp_name);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
68
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
69 - GList *l;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
70 for (l = igenerator->filenames; l != NULL; l = l->next)
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
71 {
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
72 FILE *f = fopen (l->data, "r");
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
73 @@ -1513,6 +1519,16 @@
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
74 }
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
75 }
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
76
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
77 +#ifdef _WIN32
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
78 +/* We don't want to include <windows.h> as it clashes horribly
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
79 + * with token names from scannerparser.h. So just declare
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
80 + * WaitForSingleObject, GetExitCodeProcess and INFINITE here.
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
81 + */
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
82 +extern unsigned long __stdcall WaitForSingleObject(void*, int);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
83 +extern int __stdcall GetExitCodeProcess(void*, int*);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
84 +#define INFINITE 0xffffffff
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
85 +#endif
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
86 +
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
87 static FILE *
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
88 g_igenerator_start_preprocessor (GIGenerator *igenerator,
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
89 GList *cpp_options)
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
90 @@ -1606,14 +1622,6 @@
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
91 #ifndef _WIN32
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
92 if (waitpid (pid, &status, 0) > 0)
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
93 #else
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
94 - /* We don't want to include <windows.h> as it clashes horribly
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
95 - * with token names from scannerparser.h. So just declare
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
96 - * WaitForSingleObject, GetExitCodeProcess and INFINITE here.
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
97 - */
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
98 - extern unsigned long __stdcall WaitForSingleObject(void*, int);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
99 - extern int __stdcall GetExitCodeProcess(void*, int*);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
100 -#define INFINITE 0xffffffff
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
101 -
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
102 WaitForSingleObject (pid, INFINITE);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
103
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
104 if (GetExitCodeProcess (pid, &status))
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
105 diff -ur vala-0.20.1-orig/gobject-introspection/scannerlexer.c vala-0.20.1/gobject-introspection/scannerlexer.c
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
106 --- vala-0.20.1-orig/gobject-introspection/scannerlexer.c 2013-04-08 08:54:29 -0400
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
107 +++ vala-0.20.1/gobject-introspection/scannerlexer.c 2013-07-12 19:23:43 -0400
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
108 @@ -2658,13 +2658,14 @@
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
109 /* extract current filename from #line directives */
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
110 GString *filename_builder;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
111 gboolean in_string, found_filename;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
112 + int c;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
113
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
114 lineno = 0;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
115 found_filename = FALSE;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
116 in_string = FALSE;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
117 filename_builder = g_string_new ("");
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
118
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
119 - int c = input ();
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
120 + c = input ();
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
121 while (c != EOF && c != '\n') {
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
122 if (!in_string) {
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
123 if (c == '\"') {
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
124 diff -ur vala-0.20.1-orig/gobject-introspection/scannerparser.c vala-0.20.1/gobject-introspection/scannerparser.c
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
125 --- vala-0.20.1-orig/gobject-introspection/scannerparser.c 2013-04-08 08:54:29 -0400
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
126 +++ vala-0.20.1/gobject-introspection/scannerparser.c 2013-07-12 19:24:53 -0400
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
127 @@ -3028,11 +3028,13 @@
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
128 /* Line 1792 of yacc.c */
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
129 #line 804 "scannerparser.y"
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
130 {
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
131 + CSymbol *sym;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
132 +
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
133 (yyval.ctype) = (yyvsp[(1) - (5)].ctype);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
134 (yyval.ctype)->name = (yyvsp[(2) - (5)].str);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
135 (yyval.ctype)->child_list = (yyvsp[(4) - (5)].list);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
136
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
137 - CSymbol *sym = csymbol_new (CSYMBOL_TYPE_INVALID);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
138 + sym = csymbol_new (CSYMBOL_TYPE_INVALID);
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
139 if ((yyval.ctype)->type == CTYPE_STRUCT) {
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
140 sym->type = CSYMBOL_TYPE_STRUCT;
93dc7f614289 Add vala to the package list
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
141 } else if ((yyval.ctype)->type == CTYPE_UNION) {