diff options
| author | Geremy Condra <gcondra@google.com> | 2011-11-17 14:08:04 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-17 14:08:04 -0800 |
| commit | a56904260208e9306d661349cc2bddfad8f29019 (patch) | |
| tree | 720489aa1d9176e568acf0f8cb441a3f8cb0663f /include/freetype/config/ftconfig.h | |
| parent | ec53de77a7ec24f862372a39333f8e91708a806d (diff) | |
| parent | bff90fb5ec88ad7fdfb6d1d2f5a5719c20a2c5dc (diff) | |
| download | android_external_freetype-a56904260208e9306d661349cc2bddfad8f29019.tar.gz android_external_freetype-a56904260208e9306d661349cc2bddfad8f29019.tar.bz2 android_external_freetype-a56904260208e9306d661349cc2bddfad8f29019.zip | |
Merge "DO NOT MERGE Update FreeType library to 2.4.7"
Diffstat (limited to 'include/freetype/config/ftconfig.h')
| -rw-r--r-- | include/freetype/config/ftconfig.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h index 7af737f..a9e767c 100644 --- a/include/freetype/config/ftconfig.h +++ b/include/freetype/config/ftconfig.h @@ -95,10 +95,6 @@ FT_BEGIN_HEADER #endif - /* Preferred alignment of data */ -#define FT_ALIGNMENT 8 - - /* FT_UNUSED is a macro used to indicate that a given parameter is not */ /* used -- this is only used to get rid of unpleasant compiler warnings */ #ifndef FT_UNUSED @@ -354,12 +350,12 @@ FT_BEGIN_HEADER __asm__ __volatile__ ( - "smull %1, %2, %4, %3\n\t" /* (lo=%1,hi=%2) = a*b */ - "mov %0, %2, asr #31\n\t" /* %0 = (hi >> 31) */ - "add %0, %0, #0x8000\n\t" /* %0 += 0x8000 */ - "adds %1, %1, %0\n\t" /* %1 += %0 */ - "adc %2, %2, #0\n\t" /* %2 += carry */ - "mov %0, %1, lsr #16\n\t" /* %0 = %1 >> 16 */ + "smull %1, %2, %4, %3\n\t" /* (lo=%1,hi=%2) = a*b */ + "mov %0, %2, asr #31\n\t" /* %0 = (hi >> 31) */ + "add %0, %0, #0x8000\n\t" /* %0 += 0x8000 */ + "adds %1, %1, %0\n\t" /* %1 += %0 */ + "adc %2, %2, #0\n\t" /* %2 += carry */ + "mov %0, %1, lsr #16\n\t" /* %0 = %1 >> 16 */ "orr %0, %0, %2, lsl #16\n\t" /* %0 |= %2 << 16 */ : "=r"(a), "=&r"(t2), "=&r"(t) : "r"(a), "r"(b) ); |