Index: freetype2/include/freetype/internal/ftobjs.h
===================================================================
RCS file: /cvs/freetype/freetype2/include/freetype/internal/ftobjs.h,v
retrieving revision 1.61
diff -c -r1.61 ftobjs.h
*** ftobjs.h	2002/04/14 00:54:31	1.61
--- ftobjs.h	2002/06/10 14:57:24
***************
*** 26,32 ****
  #ifndef __FTOBJS_H__
  #define __FTOBJS_H__
  
! #include <setjmp.h>
  #include <ft2build.h>
  #include FT_RENDER_H
  #include FT_SIZES_H
--- 26,32 ----
  #ifndef __FTOBJS_H__
  #define __FTOBJS_H__
  
! #include <ftstdlib.h>
  #include <ft2build.h>
  #include FT_RENDER_H
  #include FT_SIZES_H
Index: freetype2/src/autohint/ahglyph.c
===================================================================
RCS file: /cvs/freetype/freetype2/src/autohint/ahglyph.c,v
retrieving revision 1.38
diff -c -r1.38 ahglyph.c
*** ahglyph.c	2002/03/30 13:16:33	1.38
--- ahglyph.c	2002/06/10 14:57:24
***************
*** 26,32 ****
  #include "ahglobal.h"
  #include "aherrors.h"
  
! #include <stdio.h>
  
  
  #ifdef AH_DEBUG
--- 26,32 ----
  #include "ahglobal.h"
  #include "aherrors.h"
  
! #include <ftstdlib.h>
  
  
  #ifdef AH_DEBUG
Index: freetype2/src/base/ftobjs.c
===================================================================
RCS file: /cvs/freetype/freetype2/src/base/ftobjs.c,v
retrieving revision 1.133
diff -c -r1.133 ftobjs.c
*** ftobjs.c	2002/06/07 07:24:55	1.133
--- ftobjs.c	2002/06/10 14:57:24
***************
*** 45,51 ****
      int  result;
      
  
!     result = setjmp( valid->jump_buffer );
      return result;
    }
  
--- 45,51 ----
      int  result;
      
  
!     result = ft_setjmp( valid->jump_buffer );
      return result;
    }
  
***************
*** 55,61 ****
                        FT_Error      error )
    {
      valid->error = error;
!     longjmp( valid->jump_buffer, 1 );
    }                      
  
  
--- 55,61 ----
                        FT_Error      error )
    {
      valid->error = error;
!     ft_longjmp( valid->jump_buffer, 1 );
    }                      
  
  
Index: freetype2/src/base/fttype1.c
===================================================================
RCS file: /cvs/freetype/freetype2/src/base/fttype1.c,v
retrieving revision 1.2
diff -c -r1.2 fttype1.c
*** fttype1.c	2002/05/30 19:22:14	1.2
--- fttype1.c	2002/06/10 14:57:24
***************
*** 89,96 ****
        /* this will probably happen later...                         */
  
        driver_name = face->driver->root.clazz->module_name;
!       result      = ( ft_strcmp( driver_name, "type1" ) ||
!                       ft_strcmp( driver_name, "cff"   ) );
      }
  
      return result;
--- 89,96 ----
        /* this will probably happen later...                         */
  
        driver_name = face->driver->root.clazz->module_name;
!       result      = ( ft_strcmp( driver_name, "type1" ) == 0 ||
!                       ft_strcmp( driver_name, "cff"   ) == 0);
      }
  
      return result;
Index: freetype2/src/sfnt/ttcmap0.c
===================================================================
RCS file: /cvs/freetype/freetype2/src/sfnt/ttcmap0.c,v
retrieving revision 1.17
diff -c -r1.17 ttcmap0.c
*** ttcmap0.c	2002/05/02 06:50:58	1.17
--- ttcmap0.c	2002/06/10 14:57:24
***************
*** 1723,1729 ****
                                 
              valid.num_glyphs = face->root.num_glyphs;
  
!             if ( setjmp( FT_VALIDATOR( &valid )->jump_buffer ) == 0 )
              {
                /* validate this cmap sub-table */
                clazz->validate( cmap, FT_VALIDATOR( &valid ) );
--- 1723,1729 ----
                                 
              valid.num_glyphs = face->root.num_glyphs;
  
!             if ( ft_setjmp( FT_VALIDATOR( &valid )->jump_buffer ) == 0 )
              {
                /* validate this cmap sub-table */
                clazz->validate( cmap, FT_VALIDATOR( &valid ) );
Index: freetype2/src/smooth/ftgrays.c
===================================================================
RCS file: /cvs/freetype/freetype2/src/smooth/ftgrays.c,v
retrieving revision 1.50
diff -c -r1.50 ftgrays.c
*** ftgrays.c	2002/04/30 14:26:49	1.50
--- ftgrays.c	2002/06/10 14:57:25
***************
*** 101,110 ****
  
  #ifdef _STANDALONE_
  
! #include <string.h>             /* for ft_memcpy() */
! #include <setjmp.h>
! #include <limits.h>
! #define FT_UINT_MAX  UINT_MAX
  
  #define ErrRaster_Invalid_Mode     -2
  #define ErrRaster_Invalid_Outline  -1
--- 101,107 ----
  
  #ifdef _STANDALONE_
  
! #include <ftstdlib.h>
  
  #define ErrRaster_Invalid_Mode     -2
  #define ErrRaster_Invalid_Outline  -1
***************
*** 391,397 ****
      if ( !ras.invalid && ( ras.area | ras.cover ) )
      {
        if ( ras.num_cells >= ras.max_cells )
!         longjmp( ras.jump_buffer, 1 );
  
        cell        = ras.cells + ras.num_cells++;
        cell->x     = ras.ex - ras.min_ex;
--- 388,394 ----
      if ( !ras.invalid && ( ras.area | ras.cover ) )
      {
        if ( ras.num_cells >= ras.max_cells )
!         ft_longjmp( ras.jump_buffer, 1 );
  
        cell        = ras.cells + ras.num_cells++;
        cell->x     = ras.ex - ras.min_ex;
***************
*** 1791,1797 ****
  
      volatile int  error = 0;
  
!     if ( setjmp( ras.jump_buffer ) == 0 )
      {
        error = FT_Outline_Decompose( &ras.outline, &func_interface, &ras );
        gray_record_cell( RAS_VAR );
--- 1788,1794 ----
  
      volatile int  error = 0;
  
!     if ( ft_setjmp( ras.jump_buffer ) == 0 )
      {
        error = FT_Outline_Decompose( &ras.outline, &func_interface, &ras );
        gray_record_cell( RAS_VAR );