summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2010-01-05 13:01:54 +0100
committerJens-Heiner Rechtien <hr@openoffice.org>2010-01-05 13:01:54 +0100
commit2d8f81afc6407b248f435f895eb23cf843557fb1 (patch)
tree9100ee31992063db88782c3fe09f45ed5a2cccd3
parent93734378238f111aa55ad985ddd933684ee71010 (diff)
parentb1c385870a7d7c6a2c57b9d5ee9ef31203c2df0b (diff)
CWS-TOOLING: integrate CWS sb116
Notes
split repo tag: sdk_ooo/DEV300_m69
-rw-r--r--autodoc/source/parser/cpp/c_rcode.cxx21
-rw-r--r--odk/pack/gendocu/makefile.mk1
-rw-r--r--odk/source/unowinreg/win/makefile.mk2
-rw-r--r--odk/util/makefile.pmk6
4 files changed, 0 insertions, 30 deletions
diff --git a/autodoc/source/parser/cpp/c_rcode.cxx b/autodoc/source/parser/cpp/c_rcode.cxx
index e8f688168d3f..dd62dbbae2e5 100644
--- a/autodoc/source/parser/cpp/c_rcode.cxx
+++ b/autodoc/source/parser/cpp/c_rcode.cxx
@@ -42,27 +42,6 @@
#include <x_parse.hxx>
#include "pe_file.hxx"
-#ifdef IRIX
-// see i19418 incomplete type for cpp::PE_Namespace
-#include "pe_namsp.hxx"
-#include "pe_ignor.hxx"
-#include "pe_defs.hxx"
-#include "pe_vafu.hxx"
-#include "pe_tydef.hxx"
-#include "pe_tpltp.hxx"
-#include "pe_type.hxx"
-#include "pe_vari.hxx"
-#include "pe_funct.hxx"
-#include "pe_enum.hxx"
-#include "pe_param.hxx"
-#include "pe_class.hxx"
-#include "pe_expression.hxx"
-#include "pe_base.hxx"
-#include "pe_enum.hxx"
-#include "pe_enval.hxx"
-#endif
-
-
const uintt C_nNO_TRY = uintt(-1);
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index 5b070ca043f6..1970acebda7a 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -52,7 +52,6 @@ JAVA_PACKAGES=\
com.sun.star.comp.helper \
com.sun.star.lib.uno.helper \
com.sun.star.lib.unoloader \
- com.sun.star.tools.uno \
com.sun.star.uno \
$(JAVA_SRC_DIR)$/com$/sun$/star$/lib$/util$/UrlToFileMapper.java
# com.sun.star.beans \
diff --git a/odk/source/unowinreg/win/makefile.mk b/odk/source/unowinreg/win/makefile.mk
index 7c826ddb265c..2990c3b8d092 100644
--- a/odk/source/unowinreg/win/makefile.mk
+++ b/odk/source/unowinreg/win/makefile.mk
@@ -55,8 +55,6 @@ JAVA_INCLUDES+= -I$(JAVA_HOME)/include/bsd
JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux
.ELIF "$(OS)" == "NETBSD"
JAVA_INCLUDES+= -I$(JAVA_HOME)/include/netbsd
-.ELIF "$(OS)" == "IRIX"
-JAVA_INCLUDES+= -I$(JAVA_HOME)/include/solaris
.ENDIF
.ENDIF
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 57604f81b05c..33ff68c90ab1 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -162,12 +162,6 @@ DESTPLATFROM=netbsd
###########
DESTPLATFROM=freebsd
-.ELIF "$(OS)"=="IRIX"
-###########
-# IRIX
-###########
-DESTPLATFROM=irix
-
.ELIF "$(OS)"=="MACOSX"
###########
# MACOSX