#define _WX_PLATFORM_H_
+
/*
Codewarrior doesn't define any Windows symbols until some headers
are included
*/
#ifdef __MWERKS__
-# include <stddef.h>
+# include <stddef.h>
#endif
-/*
- WXMAC variants
- __WXMAC_CLASSIC__ means ppc non-carbon builds, __WXMAC_CARBON__ means
- carbon API available (mach or cfm builds) , __WXMAC_OSX__ means mach-o
- builds, running under 10.2 + only
-*/
-#ifdef __WXMAC__
-# if defined(__MACH__)
-# define __WXMAC_OSX__
-# define __WXMAC_CARBON__
-# ifdef __WXMAC_XCODE__
-# include <unistd.h>
-# include "wx/mac/carbon/config_xcode.h"
-# endif
-# else
-# if TARGET_CARBON
-# define __WXMAC_CARBON__
-# else
-# define __WXMAC_CLASSIC__
-# endif
+#ifdef __WXMAC_XCODE__
+# include <unistd.h>
+# include <TargetConditionals.h>
+# include <AvailabilityMacros.h>
+# include "wx/osx/config_xcode.h"
+# ifndef __WXOSX__
+# define __WXOSX__ 1
+# endif
+# ifndef __WXMAC__
+# define __WXMAC__ 1
# endif
-#endif
-
-/*
- __WXOSX__ is a common define to wxMac (Carbon) and wxCocoa ports under OS X.
- */
-#if defined(__WXMAC_OSX__) || defined(__WXCOCOA__)
-# define __WXOSX__
#endif
/*
# ifndef __WXMSW__
# define __WXMSW__
# endif
-
-# ifndef _WIN32
-# define _WIN32
-# endif
-
-# ifndef WIN32
-# define WIN32
-# endif
-#endif
-
-#if defined(__PALMOS__)
-# if __PALMOS__ == 0x06000000
-# define __WXPALMOS6__
-# endif
-# if __PALMOS__ == 0x05000000
-# define __WXPALMOS5__
-# endif
-# ifndef __WXPALMOS__
-# define __WXPALMOS__
-# endif
-# ifdef __WXMSW__
-# undef __WXMSW__
-# endif
-# ifdef __WINDOWS__
-# undef __WINDOWS__
-# endif
-# ifdef __WIN32__
-# undef __WIN32__
-# endif
-# ifdef WIN32
-# undef WIN32
-# endif
-# ifdef _WIN32
-# undef _WIN32
-# endif
#endif
#if defined(_WIN64)
# ifndef __WXMSW__
# define __WXMSW__
# endif
-
-# ifndef __WIN32__
-# define __WIN32__
-# endif
#endif /* Win32 */
-#if defined(__WXMSW__) || defined(__WIN32__)
+#if defined(__WXMSW__)
# if !defined(__WINDOWS__)
# define __WINDOWS__
# endif
-#endif
+
+# ifndef _WIN32
+# define _WIN32
+# endif
+
+# ifndef WIN32
+# define WIN32
+# endif
+
+# ifndef __WIN32__
+# define __WIN32__
+# endif
+#endif /* __WXMSW__ */
/* detect MS SmartPhone */
#if defined( WIN32_PLATFORM_WFSP )
# endif
#endif
+#if defined(__WXWINCE__) && defined(_MSC_VER) && (_MSC_VER == 1201)
+ #define __EVC4__
+#endif
+
#if defined(__POCKETPC__) || defined(__SMARTPHONE__) || defined(__WXGPE__)
# define __WXHANDHELD__
#endif
*/
#include "wx/setup.h"
+#ifdef __GCCXML__
+ /*
+ we're using gccxml to create an XML representation of the entire
+ wxWidgets interface; use a special setup_gccxml.h file to fix some
+ of the stuff #defined by the real setup.h
+ */
+ #include "wx/setup_gccxml.h"
+#endif
+
+/*
+ Convenience for any optional classes that use the wxAnyButton base class.
+ */
+#if wxUSE_TOGGLEBTN || wxUSE_BUTTON
+ #define wxHAS_ANY_BUTTON
+#endif
+
+
/*
Hardware platform detection.
#endif
#endif /* ia64 */
-#if defined(_M_MPPC) || defined(__PPC__)
+#if defined(_M_MPPC) || defined(__PPC__) || defined(__ppc__)
#ifndef __POWERPC__
#define __POWERPC__
#endif
/*
- This macro can be used to test the Open Watcom version.
+ test for old versions of Borland C, normally need at least 5.82, Turbo
+ explorer, available for free at http://www.turboexplorer.com/downloads
+*/
+
+
+/*
+ Older versions of Borland C have some compiler bugs that need
+ workarounds. Mostly pertains to the free command line compiler 5.5.1.
+*/
+#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x551)
+ /*
+ The Borland free compiler is unable to handle overloaded enum
+ comparisons under certain conditions e.g. when any class has a
+ conversion ctor for an integral type and there's an overload to
+ compare between an integral type and that class type.
+ */
+# define wxCOMPILER_NO_OVERLOAD_ON_ENUM
+
+ /*
+ This is needed to overcome bugs in 5.5.1 STL, linking errors will
+ result if it is not defined.
+ */
+# define _RWSTD_COMPILE_INSTANTIATE
+
+ /*
+ Preprocessor in older Borland compilers have major problems
+ concatenating with ##. Specifically, if the string operands being
+ concatenated have special meaning (e.g. L"str", 123i64 etc)
+ then ## will not concatenate the operands correctly.
+
+ As a workaround, define wxPREPEND* and wxAPPEND* without using
+ wxCONCAT_HELPER.
+ */
+# define wxCOMPILER_BROKEN_CONCAT_OPER
+#endif /* __BORLANDC__ */
+
+/*
+ Define Watcom-specific macros.
*/
#ifndef __WATCOMC__
# define wxWATCOM_VERSION(major,minor) 0
# define wxCHECK_WATCOM_VERSION(major,minor) 0
# define wxONLY_WATCOM_EARLIER_THAN(major,minor) 0
-#elif defined(__WATCOMC__) && __WATCOMC__ < 1200
-# error "Only Open Watcom is supported in this release"
+# define WX_WATCOM_ONLY_CODE( x )
#else
+# if __WATCOMC__ < 1200
+# error "Only Open Watcom is supported in this release"
+# endif
+
# define wxWATCOM_VERSION(major,minor) ( major * 100 + minor * 10 + 1100 )
# define wxCHECK_WATCOM_VERSION(major,minor) ( __WATCOMC__ >= wxWATCOM_VERSION(major,minor) )
# define wxONLY_WATCOM_EARLIER_THAN(major,minor) ( __WATCOMC__ < wxWATCOM_VERSION(major,minor) )
-#endif
-
-/*
- check the consistency of the settings in setup.h: note that this must be
- done after setting wxUSE_UNICODE correctly as it is used in wx/chkconf.h
- */
-#include "wx/chkconf.h"
-
-
-/*
- some compilers don't support iostream.h any longer, while some of theme
- are not updated with <iostream> yet, so override the users setting here
- in such case.
- */
-#if defined(_MSC_VER) && (_MSC_VER >= 1310)
-# undef wxUSE_IOSTREAMH
-# define wxUSE_IOSTREAMH 0
-#elif defined(__DMC__) || defined(__WATCOMC__)
-# undef wxUSE_IOSTREAMH
-# define wxUSE_IOSTREAMH 1
-#elif defined(__MINGW32__)
-# undef wxUSE_IOSTREAMH
-# define wxUSE_IOSTREAMH 0
-#endif /* compilers with/without iostream.h */
-
-/*
- old C++ headers (like <iostream.h>) declare classes in the global namespace
- while the new, standard ones (like <iostream>) do it in std:: namespace,
- unless it's an old gcc version.
-
- using this macro allows constuctions like "wxSTD iostream" to work in
- either case
- */
-#if !wxUSE_IOSTREAMH && (!defined(__GNUC__) || ( __GNUC__ > 2 ) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
-# define wxSTD std::
-#else
-# define wxSTD
+# define WX_WATCOM_ONLY_CODE( x ) x
#endif
/*
/*
OS: then test for generic Unix defines, then for particular flavours and
finally for Unix-like systems
+ Mac OS X matches this case (__MACH__), prior Mac OS do not.
*/
#elif defined(__UNIX__) || defined(__unix) || defined(__unix__) || \
defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) || \
defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \
- defined(__EMX__) || defined(__VMS) || defined(__BEOS__)
+ defined(__EMX__) || defined(__VMS) || defined(__BEOS__) || defined(__MACH__)
# define __UNIX_LIKE__
# endif
# endif /* SGI */
-# if defined(sun) || defined(__SUN__)
-# ifndef __GNUG__
-# ifndef __SUNCC__
-# define __SUNCC__
-# endif /* Sun CC */
-# endif
-# endif /* Sun */
+# if defined(__SUNPRO_CC)
+# ifndef __SUNCC__
+# define __SUNCC__ __SUNPRO_CC
+# endif /* Sun CC */
+# endif /* Sun CC */
# ifdef __EMX__
# define OS2EMX_PLAIN_CHAR
+# endif
+# if defined(__INNOTEK_LIBC__)
+ /* Ensure visibility of strnlen declaration */
+# define _GNU_SOURCE
# endif
/* define __HPUX__ for HP-UX where standard macro is __hpux */
# define wxSIZE_T_IS_UINT
# endif
# endif
+
+ /* All of these should already be defined by including configure-
+ generated setup.h but we wish to support Xcode compilation without
+ requiring the user to define these himself.
+ */
+# if defined(__APPLE__) && defined(__MACH__)
+# ifndef __UNIX__
+# define __UNIX__ 1
+# endif
+# ifndef __BSD__
+# define __BSD__ 1
+# endif
+ /* __DARWIN__ is our own define to mean OS X or pure Darwin */
+# ifndef __DARWIN__
+# define __DARWIN__ 1
+# endif
+ /* NOTE: TARGET_CARBON is actually a 0/1 and must be 1 for OS X */
+# ifndef TARGET_CARBON
+# define TARGET_CARBON 1
+# endif
+ /* OS X uses unsigned long size_t for both ILP32 and LP64 modes. */
+# if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+# define wxSIZE_T_IS_ULONG
+# endif
+# endif
+
+/*
+ OS: Classic Mac OS
+ */
#elif defined(applec) || \
defined(THINK_C) || \
(defined(__MWERKS__) && !defined(__INTEL__))
# if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
# define wxSIZE_T_IS_ULONG
# endif
-#elif defined(__WXMAC__) && defined(__APPLE__)
- /* Mac OS X */
-# define __UNIX_LIKE__
- /*
- These defines are needed when compiling using Project Builder
- with a non generated setup0.h
- */
-# ifndef __UNIX__
-# define __UNIX__ 1
-# endif
-# ifndef __BSD__
-# define __BSD__ 1
-# endif
-# ifndef __DARWIN__
-# define __DARWIN__ 1
-# endif
-# ifndef __POWERPC__
-# define __POWERPC__ 1
-# endif
-# ifndef TARGET_CARBON
-# define TARGET_CARBON 1
-# endif
-
-# if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
-# define wxSIZE_T_IS_ULONG
-# endif
- /*
- Some code has been added to workaround defects(?) in the
- bundled gcc compiler. These corrections are identified by
- __DARWIN__ for Darwin related corrections (wxMac, wxMotif)
- */
+/*
+ OS: OS/2
+ */
#elif defined(__OS2__)
/* wxOS2 vs. non wxOS2 ports on OS2 platform */
# endif
# define wxSIZE_T_IS_UINT
-#elif defined(__PALMOS__)
-# ifdef __WIN32__
-# error "__WIN32__ should not be defined for PalmOS"
-# endif
-# ifdef __WINDOWS__
-# error "__WINDOWS__ should not be defined for PalmOS"
-# endif
-# ifdef __WXMSW__
-# error "__WXMSW__ should not be defined for PalmOS"
-# endif
-
+/*
+ OS: Otherwise it must be Windows
+ */
#else /* Windows */
# ifndef __WINDOWS__
# define __WINDOWS__
*/
# if defined(_MSC_VER) && !defined(__MWERKS__)
# define __VISUALC__ _MSC_VER
+
+ /*
+ define special symbols for different VC version instead of writing tests
+ for magic numbers such as 1200, 1300 &c repeatedly
+ */
+# if __VISUALC__ < 1100
+# error "This Visual C++ version is too old and not supported any longer."
+# elif __VISUALC__ < 1200
+# define __VISUALC5__
+# elif __VISUALC__ < 1300
+# define __VISUALC6__
+# elif __VISUALC__ < 1400
+# define __VISUALC7__
+# elif __VISUALC__ < 1500
+# define __VISUALC8__
+# elif __VISUALC__ < 1600
+# define __VISUALC9__
+# elif __VISUALC__ < 1700
+# define __VISUALC10__
+# else
+# pragma message("Please update wx/platform.h to recognize this VC++ version")
+# endif
+
# elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
# define __BORLANDC__
# elif defined(__WATCOMC__)
/* size_t is the same as unsigned int for all Windows compilers we know, */
/* so define it if it hadn't been done by configure yet */
-# if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+# if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG) && !defined(__WIN64__)
# define wxSIZE_T_IS_UINT
# endif
#endif /* OS */
#define wxCHECK_GCC_VERSION( major, minor ) 0
#endif
+#if defined(__BORLANDC__) || (defined(__GNUC__) && __GNUC__ < 3)
+#define wxNEEDS_CHARPP
+#endif
+
+/*
+ This macro can be used to test the Visual C++ version.
+*/
+#ifndef __VISUALC__
+# define wxVISUALC_VERSION(major) 0
+# define wxCHECK_VISUALC_VERSION(major) 0
+#else
+# define wxVISUALC_VERSION(major) ( (6 + major) * 100 )
+# define wxCHECK_VISUALC_VERSION(major) ( __VISUALC__ >= wxVISUALC_VERSION(major) )
+#endif
+
/*
This macro can be used to check that the version of mingw32 compiler is
at least maj.min
!defined(__WXPM__) && \
!defined(__WXMOTIF__) && \
!defined(__WXGTK__) && \
- !defined(__WXX11__) && \
- !defined(__WXPALMOS__)
+ !defined(__WXX11__)
# include "wx/msw/gccpriv.h"
#else
# undef wxCHECK_W32API_VERSION
# define wxCHECK_W32API_VERSION(maj, min) (0)
+# undef wxCHECK_MINGW32_VERSION
+# define wxCHECK_MINGW32_VERSION(maj, min) (0)
+#endif
+
+/**
+ This is similar to wxCHECK_GCC_VERSION but for Sun CC compiler.
+ */
+#ifdef __SUNCC__
+ /*
+ __SUNCC__ is 0xVRP where V is major version, R release and P patch level
+ */
+ #define wxCHECK_SUNCC_VERSION(maj, min) (__SUNCC__ >= (((maj)<<8) | ((min)<<4)))
+#else
+ #define wxCHECK_SUNCC_VERSION(maj, min) (0)
#endif
-#if defined (__WXMSW__)
-# if !defined(__WATCOMC__)
-# define wxHAVE_RAW_BITMAP
+/*
+ Handle Darwin gcc universal compilation. Don't do this in an Apple-
+ specific case since no sane compiler should be defining either
+ __BIG_ENDIAN__ or __LITTLE_ENDIAN__ unless it really is generating
+ code that will be hosted on a machine with the appropriate endianness.
+ If a compiler defines neither, assume the user or configure set
+ WORDS_BIGENDIAN appropriately.
+ */
+#if defined(__BIG_ENDIAN__)
+# undef WORDS_BIGENDIAN
+# define WORDS_BIGENDIAN 1
+#elif defined(__LITTLE_ENDIAN__)
+# undef WORDS_BIGENDIAN
+#elif defined(__WXMAC__) && !defined(WORDS_BIGENDIAN)
+/* According to Stefan even ancient Mac compilers defined __BIG_ENDIAN__ */
+# warning "Compiling wxMac with probably wrong endianness"
+#endif
+/* also the 32/64 bit universal builds must be handled accordingly */
+#ifdef __DARWIN__
+# ifdef __LP64__
+# undef SIZEOF_VOID_P
+# undef SIZEOF_LONG
+# undef SIZEOF_SIZE_T
+# define SIZEOF_VOID_P 8
+# define SIZEOF_LONG 8
+# define SIZEOF_SIZE_T 8
+# else
+# undef SIZEOF_VOID_P
+# undef SIZEOF_LONG
+# undef SIZEOF_SIZE_T
+# define SIZEOF_VOID_P 4
+# define SIZEOF_LONG 4
+# define SIZEOF_SIZE_T 4
# endif
#endif
-#if defined (__WXMAC__)
-# if ( !defined(__MACH__) || ( defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ ) )
-# define WORDS_BIGENDIAN 1
+/*
+ Define various OS X symbols before including wx/chkconf.h which uses them.
+
+ __WXOSX_MAC__ means Mac OS X, non embedded
+ __WXOSX_IPHONE__ means OS X iPhone
+ */
+
+/*
+ Normally all of __WXOSX_XXX__, __WXOSX__ and __WXMAC__ are defined by
+ configure but ensure that we also define them if configure was not used for
+ whatever reason.
+
+ The primary symbol remains __WXOSX_XXX__ one, __WXOSX__ exists to allow
+ checking for any OS X port (Carbon and Cocoa) and __WXMAC__ is an old name
+ for it.
+ */
+#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) \
+ || (defined(__DARWIN__) && !wxUSE_GUI)
+# ifndef __WXOSX__
+# define __WXOSX__ 1
+# endif
+# ifndef __WXMAC__
+# define __WXMAC__ 1
+# endif
+#endif
+
+#ifdef __WXOSX__
+/* setup precise defines according to sdk used */
+# include <TargetConditionals.h>
+# if defined(__WXOSX_IPHONE__)
+# if !( defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE )
+# error "incorrect SDK for an iPhone build"
+# endif
+# else
+# if wxUSE_GUI && !(defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__))
+# error "one of __WXOSX_IPHONE__, __WXOSX_CARBON__ or __WXOSX_COCOA__ must be defined for the GUI build"
+# endif
+# if !( defined(TARGET_OS_MAC) && TARGET_OS_MAC )
+# error "incorrect SDK for a Mac OS X build"
+# endif
+# define __WXOSX_MAC__ 1
+# endif
+#endif
+
+#ifdef __WXOSX_MAC__
+# if defined(__MACH__)
+# include <AvailabilityMacros.h>
+# ifndef MAC_OS_X_VERSION_10_4
+# define MAC_OS_X_VERSION_10_4 1040
+# endif
+# ifndef MAC_OS_X_VERSION_10_5
+# define MAC_OS_X_VERSION_10_5 1050
+# endif
+# ifndef MAC_OS_X_VERSION_10_6
+# define MAC_OS_X_VERSION_10_6 1060
+# endif
# else
-# undef WORDS_BIGENDIAN
+# error "only mach-o configurations are supported"
# endif
#endif
+/*
+ __WXOSX_OR_COCOA__ is a common define to wxOSX (Carbon or Cocoa) and wxCocoa ports under OS X.
+
+ DO NOT use this define in base library code. Although wxMac has its own
+ private base library (and thus __WXOSX_OR_COCOA__,__WXMAC__ and related defines are
+ valid there), wxCocoa shares its library with other ports like wxGTK and wxX11.
+
+ To keep wx authors from screwing this up, only enable __WXOSX_OR_COCOA__ for wxCocoa when
+ not compiling the base library. We determine this by first checking if
+ wxUSE_BASE is not defined. If it is not defined, then we're not buildling
+ the base library, and possibly not building wx at all (but actually building
+ user code that's using wx). If it is defined then we must check to make sure
+ it is not true. If it is true, we're building base.
+
+ If you want it in the common darwin base library then use __DARWIN__. You
+ can use any Darwin-available libraries like CoreFoundation but please avoid
+ using OS X libraries like Carbon or CoreServices.
+
+ */
+#if defined(__WXOSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
+# define __WXOSX_OR_COCOA__ 1
+#endif
+
+/*
+ check the consistency of the settings in setup.h: note that this must be
+ done after setting wxUSE_UNICODE correctly as it is used in wx/chkconf.h
+ and after defining the compiler macros which are used in it too
+ */
+#include "wx/chkconf.h"
+
+
+/*
+ some compilers don't support iostream.h any longer, while some of theme
+ are not updated with <iostream> yet, so override the users setting here
+ in such case.
+ */
+#if defined(_MSC_VER) && (_MSC_VER >= 1310)
+# undef wxUSE_IOSTREAMH
+# define wxUSE_IOSTREAMH 0
+#elif defined(__DMC__) || defined(__WATCOMC__)
+# undef wxUSE_IOSTREAMH
+# define wxUSE_IOSTREAMH 1
+#elif defined(__MINGW32__)
+# undef wxUSE_IOSTREAMH
+# define wxUSE_IOSTREAMH 0
+#endif /* compilers with/without iostream.h */
+
+/*
+ old C++ headers (like <iostream.h>) declare classes in the global namespace
+ while the new, standard ones (like <iostream>) do it in std:: namespace,
+ unless it's an old gcc version.
+
+ using this macro allows constuctions like "wxSTD iostream" to work in
+ either case
+ */
+#if !wxUSE_IOSTREAMH && (!defined(__GNUC__) || ( __GNUC__ > 2 ) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
+# define wxSTD std::
+#else
+# define wxSTD
+#endif
+
+/* On OpenVMS with the most recent HP C++ compiler some function (i.e. wscanf)
+ * are only available in the std-namespace. (BUG???)
+ */
+#if defined( __VMS ) && (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD )
+# define wxVMS_USE_STD std::
+#else
+# define wxVMS_USE_STD
+#endif
+
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#ifdef __WXMOTIF__
+#define XtParent XTPARENT
+#define XtScreen XTSCREEN
+#define XtWindow XTWINDOW
+#endif
+#endif
+
/* Choose which method we will use for updating menus
* - in OnIdle, or when we receive a wxEVT_MENU_OPEN event.
* Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.
*/
#ifndef wxUSE_FILECONFIG
-# if wxUSE_CONFIG
+# if wxUSE_CONFIG && wxUSE_TEXTFILE
# define wxUSE_FILECONFIG 1
# else
# define wxUSE_FILECONFIG 0
#endif
/*
- We need AvailabilityMacros.h for ifdefing out things that don't exist on
- OSX 10.2 and lower
- FIXME: We need a better way to detect for 10.3 then including a system header
-*/
-#ifdef __DARWIN__
- #include <AvailabilityMacros.h>
-#endif
+ Optionally supported C++ features.
+ */
+
+/*
+ RTTI: if it is disabled in build/msw/makefile.* then this symbol will
+ already be defined but it's also possible to do it from configure (with
+ g++) or by editing project files with MSVC so test for it here too.
+ */
+#ifndef wxNO_RTTI
+ /*
+ Only 4.3 defines __GXX_RTTI by default so its absence is not an
+ indication of disabled RTTI with the previous versions.
+ */
+# if wxCHECK_GCC_VERSION(4, 3)
+# ifndef __GXX_RTTI
+# define wxNO_RTTI
+# endif
+# elif defined(_MSC_VER)
+# ifndef _CPPRTTI
+# define wxNO_RTTI
+# endif
+# endif
+#endif /* wxNO_RTTI */
#endif /* _WX_PLATFORM_H_ */
projects / wxWidgets.git / blobdiff