Bug#303919: pexts: FTBFS (amd64/gcc-4.0)

[Andreas Jochens]

This is an updated patch to make the current version 0.2.0-1 compile
with gcc-4.0.

Regards
Andreas Jochens

diff -urN ../tmp-orig/pexts-0.2.0/src/_Newt/functions.c ./src/_Newt/functions.c
--- ../tmp-orig/pexts-0.2.0/src/_Newt/functions.c       2005-04-22 
03:48:53.000000000 +0200
+++ ./src/_Newt/functions.c     2005-06-20 08:16:57.000000000 +0200
@@ -150,7 +150,7 @@
 }
 
 static void
-f_delay(INT32 args)
+local_f_delay(INT32 args)
 {
     if (args != 1)
         FERROR("delay", "Expected one argument, got %d instead", args);
@@ -1642,7 +1642,7 @@
     
     func_prolog("listboxGetSelection", ids, caller, NULL, 0);
 
-    (void**)items = newtListboxGetSelection(THIS_OBJ(caller)->u.component, 
&numitems);
+    items = newtListboxGetSelection(THIS_OBJ(caller)->u.component, &numitems);
 
     pop_n_elems(args);
     
@@ -1835,7 +1835,7 @@
     
     func_prolog("checkboxTreeGetSelection", ids, caller, NULL, 0);
 
-    (void**)items = 
newtCheckboxTreeGetSelection(THIS_OBJ(caller)->u.component, &numitems);
+    items = newtCheckboxTreeGetSelection(THIS_OBJ(caller)->u.component, 
&numitems);
 
     pop_n_elems(args);
     
@@ -1864,7 +1864,7 @@
     
     func_prolog("checkboxTreeGetCurrent", ids, caller, NULL, 0);
 
-    (void*)ret = newtCheckboxTreeGetCurrent(THIS_OBJ(caller)->u.component);
+    ret = newtCheckboxTreeGetCurrent(THIS_OBJ(caller)->u.component);
 
     pop_n_elems(args);
 
@@ -1906,7 +1906,7 @@
     
     pop_n_elems(args);
 
-    (void**)items = 
newtCheckboxTreeGetMultiSelection(THIS_OBJ(caller)->u.component, &numitems, 
seqnum);
+    items = newtCheckboxTreeGetMultiSelection(THIS_OBJ(caller)->u.component, 
&numitems, seqnum);
     
     /* Use numitems, as item can also be NULL... */
     for(i = 0; i < numitems; i++)
@@ -3630,7 +3630,7 @@
                  tFunc(tVoid, tVoid), 0);
     ADD_FUNCTION("clearKeyBuffer", f_clearKeyBuffer,
                  tFunc(tVoid, tVoid), 0);
-    ADD_FUNCTION("delay", f_delay,
+    ADD_FUNCTION("delay", local_f_delay,
                  tFunc(tInt, tVoid), 0);
     ADD_FUNCTION("openWindow", f_openWindow,
                  tFunc(tInt tInt tInt tInt tString, tVoid), 0);
diff -urN ../tmp-orig/pexts-0.2.0/src/_XSLT/xslt.c ./src/_XSLT/xslt.c
--- ../tmp-orig/pexts-0.2.0/src/_XSLT/xslt.c    2005-04-22 03:48:53.000000000 
+0200
+++ ./src/_XSLT/xslt.c  2005-06-19 21:02:43.000000000 +0200
@@ -178,7 +178,7 @@
     }
     strcat(out, buf);
  
-    (struct pike_string *)(store->err_str) = make_shared_string(&out[0]);
+    store->err_str = make_shared_string(&out[0]);
     add_ref(store->err_str);
     DEBUG_XSLT("leaving xsl_error() with:\n");
     DEBUG_XSLT(out);
@@ -217,7 +217,7 @@
     strcat(out, buf);
     DEBUG_XSLT("leaving xml_error():\n");
     DEBUG_XSLT(out);
-    (struct pike_string *)(store->err_str) = make_shared_string(&out[0]);
+    store->err_str = make_shared_string(&out[0]);
     add_ref(store->err_str);
 }
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]