rpms/ecl/FC-4 ecl-0.9i-gcc41.patch,NONE,1.1 ecl.spec,1.3,1.4

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/ecl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30323

Modified Files:
	ecl.spec 
Added Files:
	ecl-0.9i-gcc41.patch 
Log Message:


ecl-0.9i-gcc41.patch:

--- NEW FILE ecl-0.9i-gcc41.patch ---
--- ecl-0.9i/contrib/sockets/sockets.lisp.gcc41	2006-06-30 20:08:56.000000000 +0200
+++ ecl-0.9i/contrib/sockets/sockets.lisp	2006-06-30 21:08:24.000000000 +0200
@@ -437,7 +437,7 @@
 	if (t == t_base_string) {
 		ok = (size < x->base_string.dim);
 	} else if (t == t_vector) {
-		cl_elttype aet = x->vector.elttype;
+		cl_elttype aet = (cl_elttype)x->vector.elttype;
 		if (aet == aet_b8 || aet == aet_i8 || aet == aet_bc) {
 			ok = (size < x->vector.dim);
 		} else if (aet == aet_fix || aet == aet_index) {
@@ -567,7 +567,7 @@
 "{
         struct sockaddr_in sockaddr;
         int addr_len = sizeof(struct sockaddr_in);
-        int new_fd = accept(#0, (struct sockaddr*)&sockaddr, &addr_len);
+        int new_fd = accept(#0, (struct sockaddr*)&sockaddr, (socklen_t*)&addr_len);
 
 	@(return 0) = new_fd;
 	@(return 1) = Cnil;
@@ -769,10 +769,10 @@
         sockaddr.sun_len = sizeof(struct sockaddr_un);
 #endif
         sockaddr.sun_family = #2;
-        strncpy(&sockaddr.sun_path,#1,sizeof(sockaddr.sun_path));
+        strncpy((char*)&sockaddr.sun_path,#1,sizeof(sockaddr.sun_path));
 	sockaddr.sun_path[sizeof(sockaddr.sun_path)-1] = '\0';
 
-        @(return) = bind(#0,&sockaddr, sizeof(struct sockaddr_un));
+        @(return) = bind(#0,(struct sockaddr*)&sockaddr, sizeof(struct sockaddr_un));
 }"))
 	(socket-error "bind"))))
 
@@ -782,9 +782,9 @@
 "{
         struct sockaddr_un sockaddr;
         int addr_len = sizeof(struct sockaddr_un);
-        int new_fd = accept(#0, &sockaddr, &addr_len);
+        int new_fd = accept(#0, (struct sockaddr*)&sockaddr, (socklen_t*)&addr_len);
 	@(return 0) = new_fd;
-	@(return 1) = (new_fd == -1) ? Cnil : make_base_string_copy(&sockaddr.sun_path);
+	@(return 1) = (new_fd == -1) ? Cnil : make_base_string_copy((char*)&sockaddr.sun_path);
 }")
     (cond
       ((= fd -1)
@@ -812,10 +812,10 @@
         sockaddr.sun_len = sizeof(struct sockaddr_un);
 #endif
         sockaddr.sun_family = #1;
-        strncpy(&sockaddr.sun_path,#2,sizeof(sockaddr.sun_path));
+        strncpy((char*)&sockaddr.sun_path,#2,sizeof(sockaddr.sun_path));
 	sockaddr.sun_path[sizeof(sockaddr.sun_path)-1] = '\0';
 
-        @(return) = connect(#0,&sockaddr, sizeof(struct sockaddr_un));
+        @(return) = connect(#0,(struct sockaddr*)&sockaddr, sizeof(struct sockaddr_un));
 }"))
 	(socket-error "connect"))))
 
@@ -826,10 +826,10 @@
 {
         struct sockaddr_un name;
         socklen_t len = sizeof(struct sockaddr_un);
-        int ret = getpeername(#0,&name,&len);
+        int ret = getpeername(#0,(struct sockaddr*)&name,&len);
 
         if (ret == 0) {
-                @(return) = make_base_string_copy(&name.sun_path);
+                @(return) = make_base_string_copy((char*)&name.sun_path);
         } else {
                 @(return) = Cnil;
         }
@@ -1104,7 +1104,7 @@
 		  buffering)
 	    (t :int :int :object)
 	    t
-	    "si_set_buffering_mode(ecl_make_stream_from_fd(#0,#1,#2), #3)"
+	    "si_set_buffering_mode(ecl_make_stream_from_fd(#0,#1,(ecl_smmode)#2), #3)"
 	    :one-liner t))
 
 (defmethod socket-make-stream ((socket socket)  &rest args &key (buffering-mode NIL))


Index: ecl.spec
===================================================================
RCS file: /cvs/extras/rpms/ecl/FC-4/ecl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ecl.spec	8 Jul 2006 13:33:17 -0000	1.3
+++ ecl.spec	8 Jul 2006 13:59:02 -0000	1.4
@@ -1,12 +1,13 @@
 Name:           ecl
 Version:        0.9i
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        Embeddable Common-Lisp
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://ecls.sourceforge.net
 Source0:	http://switch.dl.sourceforge.net/sourceforge/ecls/ecl-0.9i.tgz
+Patch1:		ecl-0.9i-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	xorg-x11-devel
 BuildRequires:	m4
@@ -26,6 +27,7 @@
 
 %prep
 %setup0 -q
+%patch1 -p1
 # wrong character in texinfo file
 perl -pi -e 's|\xc7||' src/doc/user.txi
 # set rpath to the final path