[Libreoffice-commits] .: jvmfwk/plugins

[Tor Lillqvist]

 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit b0d9f19a0a294672070c0098d0882a71c33e969b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Dec 23 16:14:10 2010 +0200

    Drop inclusion of tools/prewin.h and postwin.h from sunjavaplugin.cxx
    
    That file compiles fine without them. These headers are in tools,
    which hasn't been built and delivered yet when sunjvmfwk is built. We
    can't add tools to the dependencies of jvmfwk as that would introduce
    circularity.
    
    As such, I see no reason why prewin.h and postwin.h are in tools. I
    think they should be in solenv, like premac.h and postmac.h. It would
    perhaps be an Easy Hack to move them, and drop the "tools/" from all
    lines including them?

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index e878422..dd304e8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -32,9 +32,7 @@
 #ifdef WNT
 # include <stdio.h>
 # include <sys/stat.h>
-# include <tools/prewin.h>
 # include <windows.h>
-# include <tools/postwin.h>
 #endif
 
 #if OSL_DEBUG_LEVEL > 0