solenv/bin/concat-deps.c | 12 ++++++++---- vcl/unx/gtk/gdi/salprn-gtk.cxx | 16 ++++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-)
New commits: commit 02bc9871e4b79db229ca7ec6b77526f19966758e Author: Caolán McNamara <[email protected]> Date: Mon Jan 30 13:25:02 2012 +0000 allow unaligned memory accesses only on x86/x86_64 diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index 84d688c..66b9025 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -43,7 +43,11 @@ #if __BYTE_ORDER == __LITTLE_ENDIAN #define CORE_BIG_ENDIAN 0 #define CORE_LITTLE_ENDIAN 1 +#if defined(__x86_64) || defined(__i386) #define USE_MEMORY_ALIGNMENT 64 +#else +#define USE_MEMORY_ALIGNMENT 4 +#endif #else /* !(__BYTE_ORDER == __LITTLE_ENDIAN) */ #if __BYTE_ORDER == __BIG_ENDIAN #define CORE_BIG_ENDIAN 1 @@ -369,10 +373,10 @@ struct hash static unsigned int hash_compute( struct hash* hash, const char* key, int length) { -unsigned int a; -unsigned int b; -unsigned int c; /* internal state */ -const unsigned char* uk = (const unsigned char*)key; + unsigned int a; + unsigned int b; + unsigned int c; /* internal state */ + const unsigned char* uk = (const unsigned char*)key; /* Set up the internal state */ a = b = c = 0xdeadbeef + (length << 2); commit 2f6ffa789b2fbd33f7fe1eac0512f6699ed1087f Author: Caolán McNamara <[email protected]> Date: Mon Jan 30 13:24:19 2012 +0000 tweak gtk print stuff to build against an archaic gtk2 diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index 8351575..587a754 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -452,10 +452,16 @@ GtkPrintDialog::impl_initDialog() } m_pWrapper->print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(m_pDialog), - GtkPrintCapabilities(GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | -// GTK_PRINT_CAPABILITY_REVERSE|GTK_PRINT_CAPABILITY_GENERATE_PDF|GTK_PRINT_CAPABILITY_GENERATE_PS | - GTK_PRINT_CAPABILITY_REVERSE|GTK_PRINT_CAPABILITY_GENERATE_PS | - GTK_PRINT_CAPABILITY_NUMBER_UP | GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT + GtkPrintCapabilities(GTK_PRINT_CAPABILITY_COPIES + | GTK_PRINT_CAPABILITY_COLLATE + | GTK_PRINT_CAPABILITY_REVERSE + | GTK_PRINT_CAPABILITY_GENERATE_PS +#if GTK_CHECK_VERSION(2,12,0) + | GTK_PRINT_CAPABILITY_NUMBER_UP +#endif +#if GTK_CHECK_VERSION(2,14,0) + | GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT +#endif )); } @@ -805,9 +811,11 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled ePrintPages = GTK_PRINT_PAGES_RANGES; break; case 2: +#if GTK_CHECK_VERSION(2,14,0) if (m_pWrapper->supportsPrintSelection()) ePrintPages = GTK_PRINT_PAGES_SELECTION; else +#endif SAL_INFO("vcl.gtk", "the application wants to print a selection, but the present gtk version does not support it"); break; default:
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
