[ooo-build-commit] .: 2 commits - cppu/inc idlc/source

[Caolán McNamara]

 cppu/inc/uno/lbnames.h       |   45 -------------------------------------------
 idlc/source/preproc/tokens.c |    2 -
 2 files changed, 1 insertion(+), 46 deletions(-)

New commits:
commit 1faf5f059f6b25bd11d0098b32153a9cf97bdf98
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 1 20:58:10 2010 +0100

    all of these compiler checks can go, the result is overridden anyway

diff --git a/cppu/inc/uno/lbnames.h b/cppu/inc/uno/lbnames.h
index ec5822d..7da2e25 100644
--- a/cppu/inc/uno/lbnames.h
+++ b/cppu/inc/uno/lbnames.h
@@ -29,49 +29,6 @@
 
 #ifdef __cplusplus
 
-/* environment type names for supported compilers */
-#if defined (_MSC_VER)
-#if (_MSC_VER < 1000)
-#error "ms visual c++ version must be at least 4.2"
-#elif (_MSC_VER < 1100) // MSVC 4.x
-#pragma warning( disable: 4290 )
-#define	TMP_CPPU_ENV msci
-#elif (_MSC_VER < 1600) // MSVC 5-9
-#define	TMP_CPPU_ENV msci
-#else
-#error "ms visual c++ version must be between 4.2 and 9.x"
-#endif /* (_MSC_VER < 1000) */
-/* sunpro cc */
-#elif defined (__SUNPRO_CC)
-#if ((__SUNPRO_CC >= 0x5000 && __SUNPRO_CC < 0x6000) || (__SUNPRO_CC >= 0x500 && __SUNPRO_CC < 0x600))
-#define	TMP_CPPU_ENV sunpro5
-#elif
-#error "sunpro cc version must be 5.x"
-provoking error here, because PP ignores #error
-#endif /* defined (__SUNPRO_CC) */
-/* g++ 2.x, 3.0 */
-#elif defined (__GNUC__)
-#if (__GNUC__ == 2 && __GNUC_MINOR__ == 91)
-#define	TMP_CPPU_ENV gcc2
-#elif (__GNUC__ == 2 && __GNUC_MINOR__ == 95)
-#define	TMP_CPPU_ENV gcc2
-#elif (__GNUC__ == 2)
-#error "Tested gcc 2 versions are 2.91 and 2.95.  Patch uno/lbnames.h to try your gcc 2 version."
-#elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 4)
-#define __CPPU_ENV gcc3
-#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 5)
-#define __CPPU_ENV gcc3
-#elif (__GNUC__ == 3)
-#error "Tested gcc 3 version is <= 3.4.  Patch uno/lbnames.h to try your gcc 3 version."
-#else
-#error "Supported gcc majors are 2 , 3 and 4 <= 4.5.  Unsupported gcc major version."
-#endif /* defined (__GNUC__) */
-#endif /* defined (_MSC_VER) */
-
-#if (! defined (CPPU_ENV) && defined (TMP_CPPU_ENV))
-#define CPPU_ENV TMP_CPPU_ENV
-#endif
-
 #ifdef CPPU_ENV
 
 #define CPPU_STRINGIFY_EX( x ) #x
@@ -87,8 +44,6 @@ provoking error here, because PP ignores #error
 
 #endif /* CPPU_ENV */
 
-#undef TMP_CPPU_ENV
-
 #endif /* __cplusplus */
 
 /** Environment type name for binary C UNO. */
commit 47e657c2757fa6b8dcb7069bb3882aeba7a3c504
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 1 20:17:20 2010 +0100

    idlcpp uses memcpy on overlapping areas

diff --git a/idlc/source/preproc/tokens.c b/idlc/source/preproc/tokens.c
index b8dbd45..3c64813 100644
--- a/idlc/source/preproc/tokens.c
+++ b/idlc/source/preproc/tokens.c
@@ -477,7 +477,7 @@ void
             if (write(1, wbuf, OBS) != OBS)
                 error(ERROR, "short write!");
             if (wbp > &wbuf[OBS])
-                memcpy(wbuf, wbuf + OBS, wbp - &wbuf[OBS]);
+                memmove(wbuf, wbuf + OBS, wbp - &wbuf[OBS]);
             wbp -= OBS;
         }
     }