[Libreoffice-commits] .: Branch 'feature/vos-removal' - 2 commits - bridges/test io/test remotebridges/examples sal/inc stoc/test

[Norbert Thiebaud]

 bridges/test/performance/makefile.mk |    1 -
 io/test/stm/datatest.cxx             |    1 -
 remotebridges/examples/makefile.mk   |    1 -
 sal/inc/sal/macros.h                 |   12 ++++++++++--
 sal/inc/sal/types.h                  |    1 +
 stoc/test/testintrosp.cxx            |    1 -
 6 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 739fdc741dfc54a47c1882b0191db6298a9ea3ce
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 21 15:49:51 2010 -0500

    Finally, gut the vos module out of the build

diff --git a/bridges/test/performance/makefile.mk b/bridges/test/performance/makefile.mk
index c987699..44f7ae3 100644
--- a/bridges/test/performance/makefile.mk
+++ b/bridges/test/performance/makefile.mk
@@ -53,7 +53,6 @@ APP1STDLIBS+= -lstdc++
 APP1STDLIBS+=	\
             $(CPPULIB)	\
             $(CPPUHELPERLIB)	\
-            $(VOSLIB)	\
             $(SALLIB)
 
 APP1DEF=	$(MISC)$/$(APP1TARGET).def
diff --git a/remotebridges/examples/makefile.mk b/remotebridges/examples/makefile.mk
index 64b948d..ec26878 100644
--- a/remotebridges/examples/makefile.mk
+++ b/remotebridges/examples/makefile.mk
@@ -43,7 +43,6 @@ SHL1TARGET= officeclientsample
 
 SHL1STDLIBS= \
         $(SALLIB)	\
-        $(VOSLIB)	\
         $(CPPULIB) 	\
         $(CPPUHELPERLIB) 
 
commit b1e64aa8fcca0b135114383e8dfbbb86ff3ad6f0
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 21 15:32:10 2010 -0500

    remvove vos/macros.h usage

diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx
index 454f249..3f86a21 100644
--- a/io/test/stm/datatest.cxx
+++ b/io/test/stm/datatest.cxx
@@ -58,7 +58,6 @@
 using namespace ::rtl;
 using namespace ::osl;
 using namespace ::cppu;
-//using namespace ::vos;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
diff --git a/sal/inc/sal/macros.h b/sal/inc/sal/macros.h
index 76c659b..10824ae 100644
--- a/sal/inc/sal/macros.h
+++ b/sal/inc/sal/macros.h
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 #ifndef _SAL_MACROS_H_
-#define _SAL_MACROS_H_ 
+#define _SAL_MACROS_H_
 
 #ifndef SAL_MAX
 #    define SAL_MAX(a,b)            (((a) > (b)) ? (a) : (b))
@@ -44,4 +44,12 @@
 #    define SAL_N_ELEMENTS(arr)     (sizeof (arr) / sizeof ((arr)[0]))
 #endif
 
+#ifndef SAL_BOUND
+#    define SAL_BOUND(x,l,h)        ((x) <= (l) ? (l) : ((x) >= (h) ? (h) : (x)))
+#endif
+
+#ifndef SAL_ABS
+#    define SAL_ABS(a)              (((a) < 0) ? (-(a)) : (a))
+#endif
+
 #endif
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 5a4e848..9b7d268 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -29,6 +29,7 @@
 #define _SAL_TYPES_H_
 
 #include <sal/config.h>
+#include <sal/macros.h>
 
 /* Grab __SIZEOFxxx constants from typesconfig tool on Unix */
 #if defined UNX
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 7f5fd73..abe3ac4 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -56,7 +56,6 @@
 
 using namespace rtl;
 using namespace cppu;
-//using namespace vos;
 using namespace ModuleA;
 //using namespace ModuleB;
 //using namespace ModuleC;