Changeset 0c1a5d8a in mainline

Timestamp:

2007-01-29T18:07:28Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b1349e0

Parents:

c27c988

Message:

avoid conflict with potential keyword

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• src/ipc/irq.c (modified) (2 diffs)
• src/ipc/sysipc.c (modified) (3 diffs)

kernel/generic/include/ipc/ipc.h

@@ -178 +178 @@
         answerbox_t *callerbox;
 
-        unative_t private; /**< Private data to internal IPC */
+        unative_t priv; /**< Private data to internal IPC */
 
         ipc_data_t data;  /**< Data passed from/to userspace */

kernel/generic/src/ipc/irq.c

@@ -283 +283 @@
                 IPC_SET_ARG3(call->data, a3);
                 /* Put a counter to the message */
-                call->private = ++irq->notif_cfg.counter;
+                call->priv = ++irq->notif_cfg.counter;
                 
                 send_call(irq, call);
@@ -307 +307 @@
                 call->flags |= IPC_CALL_NOTIF;
                 /* Put a counter to the message */
-                call->private = ++irq->notif_cfg.counter;
+                call->priv = ++irq->notif_cfg.counter;
                 /* Set up args */
                 IPC_SET_METHOD(call->data, irq->notif_cfg.method);

kernel/generic/src/ipc/sysipc.c

@@ -195 +195 @@
                 IPC_SET_ARG3(call->data, (unative_t)&TASK->phones[newphid]);
                 call->flags |= IPC_CALL_CONN_ME_TO;
-                call->private = newphid;
+                call->priv = newphid;
                 break;
         case IPC_M_AS_AREA_SEND:
@@ -224 +224 @@
         if (call->flags & IPC_CALL_CONN_ME_TO) {
                 if (IPC_GET_RETVAL(call->data))
-                        phone_dealloc(call->private);
+                        phone_dealloc(call->priv);
                 else
-                        IPC_SET_ARG3(call->data, call->private);
+                        IPC_SET_ARG3(call->data, call->priv);
         }
 }
@@ -528 +528 @@
 
                 /* Set in_phone_hash to the interrupt counter */
-                call->data.phone = (void *)call->private;
+                call->data.phone = (void *) call->priv;
                 
                 STRUCT_TO_USPACE(calldata, &call->data);