diff options
| author | const_k <const_k@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2008-09-28 05:08:48 +0000 |
|---|---|---|
| committer | const_k <const_k@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2008-09-28 05:08:48 +0000 |
| commit | dbaf3858bc494d3ad0a5ef315d7e4a411260014a (patch) | |
| tree | 7161b8fb96eab3b8a3f78b6e451334f9535fcd0f /trunk/jmorecfg.h | |
| parent | f585c5eedd03efb4bd59ba4343914ff9b2f58f74 (diff) | |
Merged changes from branches/1.5-xserver (revision range 2432:2631) back to trunk.
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@2 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'trunk/jmorecfg.h')
| -rw-r--r-- | trunk/jmorecfg.h | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/trunk/jmorecfg.h b/trunk/jmorecfg.h index 54a7d1c..69d4fe0 100644 --- a/trunk/jmorecfg.h +++ b/trunk/jmorecfg.h @@ -62,11 +62,11 @@ typedef unsigned char JSAMPLE; #else /* not HAVE_UNSIGNED_CHAR */ typedef char JSAMPLE; -#ifdef CHAR_IS_UNSIGNED +#ifdef __CHAR_UNSIGNED__ #define GETJSAMPLE(value) ((int) (value)) #else #define GETJSAMPLE(value) ((int) (value) & 0xFF) -#endif /* CHAR_IS_UNSIGNED */ +#endif /* __CHAR_UNSIGNED__ */ #endif /* HAVE_UNSIGNED_CHAR */ @@ -113,11 +113,11 @@ typedef unsigned char JOCTET; #else /* not HAVE_UNSIGNED_CHAR */ typedef char JOCTET; -#ifdef CHAR_IS_UNSIGNED +#ifdef __CHAR_UNSIGNED__ #define GETJOCTET(value) (value) #else #define GETJOCTET(value) ((value) & 0xFF) -#endif /* CHAR_IS_UNSIGNED */ +#endif /* __CHAR_UNSIGNED__ */ #endif /* HAVE_UNSIGNED_CHAR */ @@ -134,11 +134,11 @@ typedef char JOCTET; #ifdef HAVE_UNSIGNED_CHAR typedef unsigned char UINT8; #else /* not HAVE_UNSIGNED_CHAR */ -#ifdef CHAR_IS_UNSIGNED +#ifdef __CHAR_UNSIGNED__ typedef char UINT8; -#else /* not CHAR_IS_UNSIGNED */ +#else /* not __CHAR_UNSIGNED__ */ typedef short UINT8; -#endif /* CHAR_IS_UNSIGNED */ +#endif /* __CHAR_UNSIGNED__ */ #endif /* HAVE_UNSIGNED_CHAR */ /* UINT16 must hold at least the values 0..65535. */ @@ -319,21 +319,6 @@ typedef int boolean; /* Definitions for speed-related optimizations. */ - -/* If your compiler supports inline functions, define INLINE - * as the inline keyword; otherwise define it as empty. - */ - -#ifndef INLINE -#ifdef __GNUC__ /* for instance, GNU C knows about inline */ -#define INLINE __inline__ -#endif -#ifndef INLINE -#define INLINE /* default is to define it as empty */ -#endif -#endif - - /* On some machines (notably 68000 series) "int" is 32 bits, but multiplying * two 16-bit shorts is faster than multiplying two ints. Define MULTIPLIER * as short on such a machine. MULTIPLIER must be at least 16 bits wide. |