diff --git a/kviewshell/plugins/djvu/libdjvu/configure.in.in b/kviewshell/plugins/djvu/libdjvu/configure.in.in index 05cf6bc5..88cd71bc 100644 --- a/kviewshell/plugins/djvu/libdjvu/configure.in.in +++ b/kviewshell/plugins/djvu/libdjvu/configure.in.in @@ -335,7 +335,7 @@ if test "x$acx_pthread_ok" = xyes; then flag=no case "${host_cpu}-${host_os}" in *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";; - *solaris* | alpha*-osf*) flag="-D_REENTRANT";; + *solaris*) flag="-D_REENTRANT";; esac AC_MSG_RESULT(${flag}) if test "x$flag" != xno; then diff --git a/tdefile-plugins/bmp/tdefile_bmp.cpp b/tdefile-plugins/bmp/tdefile_bmp.cpp index 7052222f..2987bfdd 100644 --- a/tdefile-plugins/bmp/tdefile_bmp.cpp +++ b/tdefile-plugins/bmp/tdefile_bmp.cpp @@ -32,12 +32,7 @@ #include #include -#if !defined(__osf__) #include -#else -typedef unsigned long uint32_t; -typedef unsigned short uint16_t; -#endif typedef KGenericFactory BmpFactory; diff --git a/tdefile-plugins/ico/tdefile_ico.cpp b/tdefile-plugins/ico/tdefile_ico.cpp index ad6eba4f..a574c495 100644 --- a/tdefile-plugins/ico/tdefile_ico.cpp +++ b/tdefile-plugins/ico/tdefile_ico.cpp @@ -32,13 +32,7 @@ #include #include -#if !defined(__osf__) #include -#else -typedef unsigned long uint32_t; -typedef unsigned short uint16_t; -typedef unsigned char uint8_t; -#endif typedef KGenericFactory IcoFactory; diff --git a/tdefile-plugins/tga/tdefile_tga.cpp b/tdefile-plugins/tga/tdefile_tga.cpp index 683c8510..cb93e5be 100644 --- a/tdefile-plugins/tga/tdefile_tga.cpp +++ b/tdefile-plugins/tga/tdefile_tga.cpp @@ -32,13 +32,7 @@ #include #include -#if !defined(__osf__) #include -#else -typedef unsigned long uint32_t; -typedef unsigned short uint16_t; -typedef unsigned char uint8_t; -#endif typedef KGenericFactory TgaFactory; diff --git a/tdefile-plugins/xbm/tdefile_xbm.cpp b/tdefile-plugins/xbm/tdefile_xbm.cpp index c4a2cb4b..dde1c044 100644 --- a/tdefile-plugins/xbm/tdefile_xbm.cpp +++ b/tdefile-plugins/xbm/tdefile_xbm.cpp @@ -32,11 +32,7 @@ #include #include -#if !defined(__osf__) #include -#else -typedef unsigned short uint32_t; -#endif typedef KGenericFactory XbmFactory;