[Qemacs-commit] qemacs TODO tty.c libqhtml/css.c libqhtml/css.h

[Charlie Gordon]

CVSROOT:        /cvsroot/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        08/04/09 16:27:15

Modified files:
        .              : TODO tty.c 
        libqhtml       : css.c css.h 

Log message:
        fixed 32/64 bit compilation issues

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/TODO?cvsroot=qemacs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/qemacs/tty.c?cvsroot=qemacs&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/qemacs/libqhtml/css.c?cvsroot=qemacs&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/qemacs/libqhtml/css.h?cvsroot=qemacs&r1=1.7&r2=1.8

Patches:
Index: TODO
===================================================================
RCS file: /cvsroot/qemacs/qemacs/TODO,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- TODO        4 Apr 2008 18:23:10 -0000       1.14
+++ TODO        9 Apr 2008 16:27:15 -0000       1.15
@@ -129,8 +129,8 @@
   do_list_buffers()
   do_dired()
 
-- fix 32 bit assumptions:
-  qe.c:3133: call_func(): sizeof(int) == sizeof(void*) == sizeof(char*)
+DONE   - fix 32 bit assumptions:
+DONE     qe.c:3133: call_func(): sizeof(int) == sizeof(void*) == sizeof(char*)
 
 DONE   support for high intensity colors in terminal mode (selected as bold)
 add colorized buffers using shell buffer method

Index: tty.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/tty.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- tty.c       8 Apr 2008 19:57:33 -0000       1.40
+++ tty.c       9 Apr 2008 16:27:15 -0000       1.41
@@ -1087,7 +1087,8 @@
              * double-width glyphs on the row in front of this
              * difference
              */
-            TTY_FPRINTF(s->STDOUT, "\033[%d;%dH", y + 1, ptr1 - ptr + 1);
+            TTY_FPRINTF(s->STDOUT, "\033[%d;%dH",
+                        y + 1, (int)(ptr1 - ptr + 1));
 
             while (ptr1 < ptr4) {
                 cc = *ptr1;

Index: libqhtml/css.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/libqhtml/css.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libqhtml/css.c      8 Jan 2008 16:37:55 -0000       1.18
+++ libqhtml/css.c      9 Apr 2008 16:27:15 -0000       1.19
@@ -38,11 +38,11 @@
                             int index, int list_style_type, int adjust);
 
 #define CSSDEF(str, ident, inherited, type) \
-  { str, (int)&((CSSState *)0)->ident, CSS_STORAGE_INT, \
+  { str, offsetof(CSSState, ident), CSS_STORAGE_INT, \
     type | (inherited ? CSS_TYPE_INHERITED : 0) },
 
 #define CSSDEF1(str, ident, inherited, type, storage) \
-  { str, (int)&((CSSState *)0)->ident, storage, \
+  { str, offsetof(CSSState, ident), storage, \
     type | (inherited ? CSS_TYPE_INHERITED : 0) },
 #define CSSUNDEF(str)
 

Index: libqhtml/css.h
===================================================================
RCS file: /cvsroot/qemacs/qemacs/libqhtml/css.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libqhtml/css.h      3 Jan 2008 09:51:32 -0000       1.7
+++ libqhtml/css.h      9 Apr 2008 16:27:15 -0000       1.8
@@ -521,7 +521,7 @@
 struct CSSContext;
 
 #define PROPS_HASH_SIZE 521
-#define PROPS_SIZE ((int)&((CSSState *)0)->hash_next)
+#define PROPS_SIZE  offsetof(CSSState, hash_next)
 
 typedef struct CSSCounterValue {
     CSSIdent counter_id;