SOURCES: einstein-gcc43.patch - x86-64 buildfix

adamg adamg at pld-linux.org
Fri Jan 2 22:30:54 CET 2009


Author: adamg                        Date: Fri Jan  2 21:30:54 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- x86-64 buildfix

---- Files affected:
SOURCES:
   einstein-gcc43.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/einstein-gcc43.patch
diff -u SOURCES/einstein-gcc43.patch:1.1 SOURCES/einstein-gcc43.patch:1.2
--- SOURCES/einstein-gcc43.patch:1.1	Fri Jan  2 14:29:20 2009
+++ SOURCES/einstein-gcc43.patch	Fri Jan  2 22:30:48 2009
@@ -18,3 +18,34 @@
  
  
  /// Returns length of wide character in utf-8
+--- einstein-2.0/formatter.cpp~	2005-08-14 04:40:58.000000000 +0200
++++ einstein-2.0/formatter.cpp	2009-01-02 22:29:07.209885720 +0100
+@@ -58,7 +58,7 @@
+             if ((c.type == INT_ARG) || (c.type == STRING_ARG) ||
+                     (c.type == FLOAT_ARG) || (c.type == DOUBLE_ARG))
+             {
+-                int no = (int)c.data;
++                long int no = (long int)c.data;
+                 args[no - 1] = c.type;
+             }
+         }
+@@ -123,7 +123,7 @@
+ std::wstring Formatter::format(std::vector<ArgValue*> &argValues) const
+ {
+     std::wstring s;
+-    int no;
++    long int no;
+ 
+     for (int i = 0; i < commandsCnt; i++) {
+         Command *cmd = &commands[i];
+@@ -135,8 +135,8 @@
+                 
+             case STRING_ARG:
+             case INT_ARG:
+-                no = (int)cmd->data - 1;
+-                if (no < (int)argValues.size())
++                no = (long int)cmd->data - 1;
++                if (no < (long int)argValues.size())
+                     s += argValues[no]->format(cmd);
+                 break;
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/einstein-gcc43.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list