--- Merging r35475 into '.':

U    utils/h2pas/h2pas.y
U    utils/h2pas/h2pas.pas
--- Recording mergeinfo for merge of r35475 into '.':
 U   .

# revisions: 35475

git-svn-id: branches/fixes_3_0@36076 -

utils/h2pas/h2pas.pas

@@ -690,8 +690,10 @@ program h2pas;
                    (* is this a good method ??                       *)
                    if varpara and
                       (p^.p1^.p1^.typ=t_pointerdef) and
-                      (p^.p1^.p1^.p1^.typ=t_id) and
-                      (pos('CHAR',uppercase(p^.p1^.p1^.p1^.str))<>0) then
+                      (((p^.p1^.p1^.p1^.typ=t_id) and
+                        (pos('CHAR',uppercase(p^.p1^.p1^.p1^.str))<>0)) or
+                        ((p^.p1^.p1^.p1^.typ=t_void))
+                      ) then
                      varpara:=false;
                    if varpara then
                      begin

utils/h2pas/h2pas.y

@@ -686,8 +686,10 @@ program h2pas;
                    (* is this a good method ??                       *)
                    if varpara and
                       (p^.p1^.p1^.typ=t_pointerdef) and
-                      (p^.p1^.p1^.p1^.typ=t_id) and
-                      (pos('CHAR',uppercase(p^.p1^.p1^.p1^.str))<>0) then
+                      (((p^.p1^.p1^.p1^.typ=t_id) and
+                        (pos('CHAR',uppercase(p^.p1^.p1^.p1^.str))<>0)) or
+                        ((p^.p1^.p1^.p1^.typ=t_void))
+                      ) then
                      varpara:=false;
                    if varpara then
                      begin