hurd-l4/libl4/l4 types.h compat/types.h

[Marcus Brinkmann]

CVSROOT:        /cvsroot/hurd
Module name:    hurd-l4
Branch:         
Changes by:     Marcus Brinkmann <address@hidden>       03/09/09 18:07:50

Modified files:
        libl4/l4       : types.h 
        libl4/l4/compat: types.h 

Log message:
        Fix up the last change that slipped in.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/libl4/l4/types.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/libl4/l4/compat/types.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: hurd-l4/libl4/l4/compat/types.h
diff -u hurd-l4/libl4/l4/compat/types.h:1.2 hurd-l4/libl4/l4/compat/types.h:1.3
--- hurd-l4/libl4/l4/compat/types.h:1.2 Tue Sep  9 17:43:12 2003
+++ hurd-l4/libl4/l4/compat/types.h     Tue Sep  9 18:07:50 2003
@@ -42,7 +42,9 @@
 static inline L4_Clock_t                                               \
 L4_Clock ## name ## Usec (const L4_Clock_t clock, const L4_Word64_t usec) \
 {                                                                      \
-  return ((L4_Clock_t) { .clock = clock.clock op usec });              \
+  L4_Clock_t new_clock;                                                        
\
+  new_clock.clock = clock.clock op usec;                               \
+  return new_clock;                                                    \
 }
 
 _L4_CLOCK_OP(Add, +)
@@ -59,7 +61,7 @@
 
 _L4_CLOCK_OP(Earlier, <)
 _L4_CLOCK_OP(Later, >)
-_L4_CLOCK_OP(Equal, =)
+_L4_CLOCK_OP(Equal, ==)
 _L4_CLOCK_OP(NotEqual, !=)
 #undef _L4_CLOCK_OP
 
@@ -70,7 +72,9 @@
 static inline L4_Clock_t                                               \
 operator ## op ## (const L4_Clock_t& clock, const type usec)           \
 {                                                                      \
-  return ((L4_Clock_t) { .clock = clock.clock op usec });              \
+  L4_Clock_t new_clock;                                                        
\
+  new_clock.clock = clock op usec;                                     \
+  return new_clock;                                                    \
 }
 
 _L4_CLOCK_OP(+, int)
Index: hurd-l4/libl4/l4/types.h
diff -u hurd-l4/libl4/l4/types.h:1.2 hurd-l4/libl4/l4/types.h:1.3
--- hurd-l4/libl4/l4/types.h:1.2        Mon Sep  8 13:44:32 2003
+++ hurd-l4/libl4/l4/types.h    Tue Sep  9 18:07:49 2003
@@ -118,9 +118,9 @@
     x;                         \
   }
 
-#define _L4_STRUCT1(s1)                struct s1;
-#define _L4_STRUCT2(s1, s2)    struct s1; struct s2;
-#define _L4_STRUCT3(s1, s2, s3)        struct s1; struct s2; struct s3;
+#define _L4_STRUCT1(s1)                struct s1
+#define _L4_STRUCT2(s1, s2)    struct s1; struct s2
+#define _L4_STRUCT3(s1, s2, s3)        struct s1; struct s2; struct s3
 #define _L4_STRUCT4(s1, s2, s3, s4) \
   struct s1; struct s2; struct s3; struct s4