diff options
| m--------- | admin | 0 | ||||
| -rw-r--r-- | kpdf/xpdf/xpdf/xpdf_config.h | 4 | ||||
| -rw-r--r-- | kviewshell/plugins/djvu/djvurenderer.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/admin b/admin -Subproject 272990b269b5c72b397c6804397ad81e68c3791 +Subproject 85116532467b2bb4c73caf54c106c91a22dbe37 diff --git a/kpdf/xpdf/xpdf/xpdf_config.h b/kpdf/xpdf/xpdf/xpdf_config.h index f00a6381..fdd7bc38 100644 --- a/kpdf/xpdf/xpdf/xpdf_config.h +++ b/kpdf/xpdf/xpdf/xpdf_config.h @@ -84,7 +84,7 @@ // popen //------------------------------------------------------------------------ -#if defined(_MSC_VER) || defined(__BORLANDC__) +#if defined(_MSC_VER) #define popen _popen #define pclose _pclose #endif @@ -103,7 +103,7 @@ #undef CDECL #endif -#if defined(_MSC_VER) || defined(__BORLANDC__) +#if defined(_MSC_VER) #define CDECL __cdecl #else #define CDECL diff --git a/kviewshell/plugins/djvu/djvurenderer.cpp b/kviewshell/plugins/djvu/djvurenderer.cpp index c9e52c1e..2bac1743 100644 --- a/kviewshell/plugins/djvu/djvurenderer.cpp +++ b/kviewshell/plugins/djvu/djvurenderer.cpp @@ -27,7 +27,7 @@ #include <tqfileinfo.h> #include <tqimage.h> #include <tqpainter.h> -#include <kapp.h> +#include <tdeapplication.h> #include "GBitmap.h" #include "BSByteStream.h" |