[Libreoffice-commits] .: 2 commits - set_soenv.in soltools/cpp

[Caolán McNamara]

 set_soenv.in          |    2 +-
 soltools/cpp/_macro.c |    2 +-
 soltools/cpp/cpp.h    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 498aef6d460be780cde9bcdfa21ebf084acad4c5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 3 13:18:02 2011 +0000

    odf1->osf1

diff --git a/set_soenv.in b/set_soenv.in
index 7c5fe7d..0afcc65 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1139,7 +1139,7 @@ if ($platform =~ m/cygwin|os2/)
 }
 
 # The general environment path.
-if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris|openbsd/)
+if ($platform =~ m/linux|netbsd|osf1|freebsd|aix|solaris|openbsd/)
 {  $PATH              = $cur_dir.
 #                        $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
                         $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
commit 8afe6b8752e37fb7bab91c6dec1981692b7bb28d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 3 11:35:01 2011 +0000

    WaE: signed/unsigned

diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c
index 472e09b..984a608 100644
--- a/soltools/cpp/_macro.c
+++ b/soltools/cpp/_macro.c
@@ -52,7 +52,7 @@ void
         if (tp->type != RP)
         {
             /* macro with args */
-            int narg = 0;
+            size_t narg = 0;
             int err = 0;
 
             for (;;)
diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h
index 96473e1..ed30a2c 100644
--- a/soltools/cpp/cpp.h
+++ b/soltools/cpp/cpp.h
@@ -65,7 +65,7 @@ typedef struct tokenrow
     Token *tp;                          /* current one to scan */
     Token *bp;                          /* base (allocated value) */
     Token *lp;                          /* last+1 token used */
-    int max;                            /* number allocated */
+    size_t max;                         /* number allocated */
 }   Tokenrow;
 
 typedef struct source