|
From: Alex M. S. <arc...@us...> - 2010-08-29 19:45:38
|
Update of /cvsroot/nettle/nettle/c In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30625/c Modified Files: choices dnslib main socket sockwatch wimp Log Message: Committing James Bursa's changes for building with GCC. Haven't tested this aspect of it, but verified that it still builds OK with Norcroft C 5.54 with these changes applied. Index: choices =================================================================== RCS file: /cvsroot/nettle/nettle/c/choices,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** choices 11 Apr 2010 21:39:02 -0000 1.42 --- choices 29 Aug 2010 19:45:29 -0000 1.43 *************** *** 23,27 **** --- 23,30 ---- /*#include <errno.h>*/ + #include "sys/types.h" + #ifndef __UNIXLIB_TYPES_H #define errno __errno + #endif extern int errno; Index: dnslib =================================================================== RCS file: /cvsroot/nettle/nettle/c/dnslib,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** dnslib 20 Oct 2003 20:39:24 -0000 1.12 --- dnslib 29 Aug 2010 19:45:29 -0000 1.13 *************** *** 10,14 **** --- 10,16 ---- #include "sys/types.h" + #ifndef __UNIXLIB_TYPES_H #include "inetlib.h" + #endif #include "netinet/in.h" Index: main =================================================================== RCS file: /cvsroot/nettle/nettle/c/main,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** main 10 Feb 2002 03:12:59 -0000 1.45 --- main 29 Aug 2010 19:45:29 -0000 1.46 *************** *** 24,28 **** * and during dns / connect, etc.) */ ! const char *__dynamic_da_name = "Nettle Heap"; --- 24,28 ---- * and during dns / connect, etc.) */ ! const char * const __dynamic_da_name = "Nettle Heap"; Index: socket =================================================================== RCS file: /cvsroot/nettle/nettle/c/socket,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** socket 13 Apr 2004 20:30:56 -0000 1.39 --- socket 29 Aug 2010 19:45:29 -0000 1.40 *************** *** 15,20 **** --- 15,22 ---- #include "sys/ioctl.h" #include "sys/socket.h" + #ifndef __UNIXLIB_TYPES_H #include "socklib.h" #include "inetlib.h" + #endif #include "sys/errno.h" #include "sys/time.h" *************** *** 28,33 **** --- 30,39 ---- #include "sockwatch.h" + #ifndef __UNIXLIB_TYPES_H #define ioctl socketioctl #define close socketclose + #else + #define timerclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0) + #endif int socket_connecttoip(unsigned long ip_address,int port_number) Index: sockwatch =================================================================== RCS file: /cvsroot/nettle/nettle/c/sockwatch,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** sockwatch 26 Oct 2003 13:45:20 -0000 1.7 --- sockwatch 29 Aug 2010 19:45:29 -0000 1.8 *************** *** 11,14 **** --- 11,15 ---- #include <stdio.h> + #include <unistd.h> #include "kernel.h" *************** *** 19,24 **** --- 20,27 ---- #include "sys/ioctl.h" #include "sys/socket.h" + #ifndef __UNIXLIB_TYPES_H #include "socklib.h" #include "sys/filio.h" + #endif #include "generic.h" *************** *** 32,37 **** --- 35,42 ---- #define SocketWatch_DeallocPW 0x52284 + #ifndef __UNIXLIB_TYPES_H #define ioctl socketioctl #define close socketclose + #endif typedef struct *************** *** 47,50 **** --- 52,60 ---- return; + #ifdef __UNIXLIB_TYPES_H + /* get the underlying RISC OS socket handle from the Unixlib socket */ + socket = __unixlib_getdev(socket); + #endif + if ( newinternet ) { *************** *** 68,71 **** --- 78,85 ---- return; + #ifdef __UNIXLIB_TYPES_H + socket = __unixlib_getdev(socket); + #endif + if ( newinternet ) { Index: wimp =================================================================== RCS file: /cvsroot/nettle/nettle/c/wimp,v retrieving revision 1.197 retrieving revision 1.198 diff -C2 -d -r1.197 -r1.198 *** wimp 13 Dec 2003 17:42:56 -0000 1.197 --- wimp 29 Aug 2010 19:45:29 -0000 1.198 *************** *** 13,18 **** --- 13,21 ---- #include "sys/errno.h" + #include "sys/types.h" + #ifndef __UNIXLIB_TYPES_H #include "socklib.h" #include "unixlib.h" + #endif #include "sys/time.h" |