[Libreoffice-commits] core.git: scp2/source

[Stephan Bergmann]

 scp2/source/ooo/ure.scp |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 836a93e24e4b1db3aa508ed8554ab13bc8788e74
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 25 10:38:12 2014 +0100

    Simplify some #if
    
    Change-Id: I9d3239bdbb92f715b050fd91238add5588969bf0

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 6dd8e7e..9da2e26 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -20,23 +20,18 @@
 
 #include "AutoInstall/ure"
 
-#ifndef MACOSX
+#if !defined MACOSX
+
 Directory gid_Dir_Common_Ure
   #ifdef WNT
     ParentID = gid_Dir_Brand_Root;
-  #else
-    ParentID = PREDEFINED_PROGDIR;
-  #endif
-  #ifdef WNT
     HostName = "URE";
   #else
+    ParentID = PREDEFINED_PROGDIR;
     HostName = "ure";
   #endif
     Styles = (UREDIRECTORY);
 End
-#endif
-
-#if !defined MACOSX
 
 Directory gid_Dir_Ure_Bin
     ParentID = gid_Dir_Common_Ure;