[Libreoffice-commits] .: rsc/source

2011-11-25 Thread François Tigeot
 rsc/source/rscpp/cpp5.c   |8 
 rsc/source/rscpp/cppdef.h |   11 ---
 2 files changed, 19 deletions(-)

New commits:
commit a5cabdbc747bfd13216bf45f50ec36ad28cfed53
Author: François Tigeot ftig...@wolfpond.org
Date:   Fri Nov 25 14:42:10 2011 +0100

BIG_ENDIAN was never set

Remove its conditional code

diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c
index 4eb3183..24b13b9 100644
--- a/rsc/source/rscpp/cpp5.c
+++ b/rsc/source/rscpp/cpp5.c
@@ -750,19 +750,11 @@ evalchar(int skip)
  * We warn on multi-byte constants and try to hack
  * (big|little)endian machines.
  */
-#if BIG_ENDIAN
-count = 0;
-#endif
 while ((c = get()) != '\''  c != EOF_CHAR  c != '\n') {
 if (!skip)
 ciwarn(multi-byte constant '%c' isn't portable, c);
-#if BIG_ENDIAN
-count += BITS_CHAR;
-value += (c  count);
-#else
 value = BITS_CHAR;
 value += c;
-#endif
 }
 instring = FALSE;
 return (value);
diff --git a/rsc/source/rscpp/cppdef.h b/rsc/source/rscpp/cppdef.h
index 2490f1d..29b5d92 100644
--- a/rsc/source/rscpp/cppdef.h
+++ b/rsc/source/rscpp/cppdef.h
@@ -220,17 +220,6 @@
 #endif
 
 /*
- * BIG_ENDIAN is set TRUE on machines (such as the IBM 360 series)
- * where 'ab' stores 'a' in the high-bits and 'b' in the low-bits.
- * It is set FALSE on machines (such as the PDP-11 and Vax-11)
- * where 'ab' stores 'a' in the low-bits and 'b' in the high-bits.
- * (Or is it the other way around?) -- Warning: BIG_ENDIAN code is untested.
- */
-#ifndef BIG_ENDIAN
-#define BIG_ENDIAN  FALSE
-#endif
-
-/*
  * COMMENT_INVISIBLE may be defined to allow old-style comment
  * processing, whereby the comment becomes a zero-length token
  * delimiter.  This permitted tokens to be concatenated in macro
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: rsc/source

2011-09-28 Thread Tor Lillqvist
 rsc/source/parser/rscyacc.y |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit d455410a3de86d2c772a96e50ff0d4c066c1605e
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Sep 28 13:20:32 2011 +0300

Look at GCC version, not whether MacOSX or not

diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y
index b48537a..4c8f981 100644
--- a/rsc/source/parser/rscyacc.y
+++ b/rsc/source/parser/rscyacc.y
@@ -265,7 +265,11 @@ RSCINST GetFirstTupelEle( const RSCINST  rTop )
 #pragma warning(disable:4129 4273 4701 4702)
 #endif
 #if defined __GNUC__
-#ifndef MACOSX
+#define GCC_VERSION (__GNUC__ * 1 \
+ + __GNUC_MINOR__ * 100 \
+ + __GNUC_PATCHLEVEL__)
+/* Diagnostics pragma was introduced with gcc-4.2.1 */
+#if GCC_VERSION = 40201
 #pragma GCC diagnostic ignored -Wwrite-strings
 #endif
 #elif defined __SUNPRO_CC
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: rsc/source

2011-09-23 Thread Tor Lillqvist
 rsc/source/parser/rscibas.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9da0b9d70d81f33fd45546ef5ad7b7aeda1fc3fa
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Sep 23 12:15:34 2011 +0300

Fix broken implicit string conversion

diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index b0114e2..d44567e 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -97,7 +97,6 @@ void RscLangEnum::Init( RscNameTable rNames )
 
 sal_Int32 nIndex = 0;
 mnLangId = 0x400; // stay away from selfdefined...
-char csep = '-';
 const MsLangId::IsoLangEntry* pLangEntry;
 
 while ( NULL != ( pLangEntry = MsLangId::getIsoLangEntry( nIndex ))  ( 
pLangEntry-mnLang != LANGUAGE_DONTKNOW ))
@@ -129,7 +128,7 @@ void RscLangEnum::Init( RscNameTable rNames )
 fprintf( stderr, ISO Language out: %s 0x%lx, aLang.getStr(), 
mnLangId );
 #endif
 mnLangId++;
-aLang = aLang + csep + aCountry.toAsciiUpperCase();
+aLang = aLang + rtl::OString( '-' ) + aCountry.toAsciiUpperCase();
 SetConstant( rNames.Put( aLang.getStr(), CONSTNAME, mnLangId ), 
mnLangId );
 if ( ! GetLangId( aLang ))
 ULong_Iso_map[ aLang ] = mnLangId;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits