*** src/Makefile.in.ORIG	Fri Jul  4 23:55:03 2008
--- src/Makefile.in	Fri Jul  4 23:55:20 2008
***************
*** 173,179 ****
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  INCLUDES = -I$(top_srcdir)/include
! LDADD = $(top_builddir)/libemf/libEMF.la -lstdc++ -lm
  all: all-am
  
  .SUFFIXES:
--- 173,179 ----
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  INCLUDES = -I$(top_srcdir)/include
! LDADD = $(top_builddir)/libemf/libEMF.la -lm
  all: all-am
  
  .SUFFIXES:
*** include/libEMF/wine/basetsd.h.ORIG	Fri Jul  4 23:46:18 2008
--- include/libEMF/wine/basetsd.h	Fri Jul  4 23:48:58 2008
***************
*** 24,42 ****
  
  /* Type model indepent typedefs */
  
! typedef char          __int8;
  typedef unsigned char __uint8;
  
! typedef short          __int16;
  typedef unsigned short __uint16;
  
! typedef int          __int32;
  typedef unsigned int __uint32;
  
  // wogl
  //typedef long long          __int64;
  //typedef unsigned long long __uint64;
! typedef long          __int64;
  typedef unsigned long __uint64;
  
  #if defined(_WIN64)
--- 24,42 ----
  
  /* Type model indepent typedefs */
  
! //typedef char          __int8;
  typedef unsigned char __uint8;
  
! //typedef short          __int16;
  typedef unsigned short __uint16;
  
! //typedef int          __int32;
  typedef unsigned int __uint32;
  
  // wogl
  //typedef long long          __int64;
  //typedef unsigned long long __uint64;
! //typedef long          __int64;
  typedef unsigned long __uint64;
  
  #if defined(_WIN64)
***************
*** 47,53 ****
  #else /* FIXME: defined(_WIN32) */
  
  typedef void    *__ptr32;
! typedef __uint64 __ptr64;
  
  #endif
  
--- 47,53 ----
  #else /* FIXME: defined(_WIN32) */
  
  typedef void    *__ptr32;
! //typedef __uint64 __ptr64;
  
  #endif
  
*** include/libEMF/wine/poppack.h.ORIG	Fri Jul  4 23:44:04 2008
--- include/libEMF/wine/poppack.h	Fri Jul  4 23:44:59 2008
***************
*** 44,50 ****
  #  endif
  /* Depth == 1 */
  
! #  if defined(__GNUC__) || defined(__SUNPRO_C)
  #    pragma pack()
  #  elif defined(__SUNPRO_CC)
  /*#    warning "Assuming a default alignment of 4"*/
--- 44,50 ----
  #  endif
  /* Depth == 1 */
  
! #  if defined(__GNUC__) || defined(__SUNPRO_C) || defined(_AIX)
  #    pragma pack()
  #  elif defined(__SUNPRO_CC)
  /*#    warning "Assuming a default alignment of 4"*/
*** include/libEMF/wine/pshpack2.h.ORIG	Fri Jul  4 23:45:16 2008
--- include/libEMF/wine/pshpack2.h	Fri Jul  4 23:45:29 2008
***************
*** 20,26 ****
  #    include "poppack.h"
  #  endif
  
! #  if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
  #    pragma pack(2)
  #  elif !defined(RC_INVOKED)
  #    error "Adjusting the alignment is not supported with this compiler"
--- 20,26 ----
  #    include "poppack.h"
  #  endif
  
! #  if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(_AIX)
  #    pragma pack(2)
  #  elif !defined(RC_INVOKED)
  #    error "Adjusting the alignment is not supported with this compiler"
*** include/libEMF/wine/pshpack4.h.ORIG	Fri Jul  4 23:45:45 2008
--- include/libEMF/wine/pshpack4.h	Fri Jul  4 23:45:56 2008
***************
*** 20,26 ****
  #    include "poppack.h"
  #  endif
  
! #  if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
  #    pragma pack(4)
  #  elif !defined(RC_INVOKED)
  #    error "Adjusting the alignment is not supported with this compiler"
--- 20,26 ----
  #    include "poppack.h"
  #  endif
  
! #  if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(_AIX)
  #    pragma pack(4)
  #  elif !defined(RC_INVOKED)
  #    error "Adjusting the alignment is not supported with this compiler"