[ro-oslib-commits] OSLib/!OsLib/Tools/support x.c,1.2,1.3 x.h,1.2,1.3

[Tony v. d. H. <to...@us...>]

Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/support
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9935/!OsLib/Tools/support

Modified Files:
	x.c x.h 
Log Message:
Changes to facilitate GCCSDK autobuilder support. (20051231-1 John Tytgat)

Index: x.h
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/support/x.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** x.h	3 May 2004 15:03:39 -0000	1.2
--- x.h	31 Dec 2005 12:06:32 -0000	1.3
***************
*** 17,36 ****
  #endif
  
! #define x_MAXDEPTH 256
! 
! #ifdef EXECUTE_ON_UNIX
  #  define SIGOSERROR (SIGUSR1)
- #else
- /* the following signals are defined in CLib, but not in UNIXLib */
- /* Stack overflow.  */
- #  if !defined SIGSTAK
- #    define SIGSTAK 7
- #  endif
- /* Operating system error.  */
- #  if !defined SIGOSERROR
- #    define SIGOSERROR 10
- #  endif
  #endif
  
  typedef struct x_exception
  {
--- 17,28 ----
  #endif
  
! /* We really need SIGOSERROR defined.  Normally UnixLib and CLib do have
!    a definition, but not necessarily all Unix platforms.  */
! #ifndef SIGOSERROR
  #  define SIGOSERROR (SIGUSR1)
  #endif
  
+ #define x_MAXDEPTH 256
+ 
  typedef struct x_exception
  {

Index: x.c
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/support/x.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** x.c	3 May 2004 15:03:39 -0000	1.2
--- x.c	31 Dec 2005 12:06:32 -0000	1.3
***************
*** 1,6 ****
  /****************************************************************
! ** Title  :   	SupportLib.c.x.c.x
  **
! ** Purpose:   	RiscOs Exception Handling
  **
  ** Copyright:   ©OSLib
--- 1,6 ----
  /****************************************************************
! ** Title  :   	Tools.support.c.x
  **
! ** Purpose:   	RISC OS Exception Handling
  **
  ** Copyright:   ©OSLib
***************
*** 100,108 ****
  x_LOCAL_ERROR( Error_No_Memory, os_GLOBAL_NO_MEM, "NoMem" );
  
! static int Signals [] = { SIGINT,
  #ifdef SIGSTAK
    SIGSTAK,
  #endif
!   SIGOSERROR };
  
  
--- 100,114 ----
  x_LOCAL_ERROR( Error_No_Memory, os_GLOBAL_NO_MEM, "NoMem" );
  
! 
! /* we assume SIGINT is always defined. */
! static const int Signals [] = {
  #ifdef SIGSTAK
    SIGSTAK,
  #endif
! #ifdef SIGOSERROR
!   SIGOSERROR,
! #endif
!   SIGINT
!   };
  
  
***************
*** 170,176 ****
--- 176,184 ----
  #endif
  
+ #ifdef SIGOSERROR
      case SIGOSERROR:
        Error = x__last_error();
        break;
+ #endif
     }