fix the somehow newly introduced warnings

diff --git a/drivers/filter/md5.c b/drivers/filter/md5.c
index a2a4b2961b72b091d268db84cf3fce3bd59f6dd1..f2962242a8c6c4e3b7253f8b19a991a89978ac63 100644 (file)
--- a/drivers/filter/md5.c
+++ b/drivers/filter/md5.c
@@ -188,7 +188,7 @@ MD5Final (digest, ctx)
  * reflect the addition of 16 longwords of new data.  MD5Update blocks
  * the data and converts bytes into longwords for this routine.
  */
-static void
+void
 MD5Transform (buf, inraw)
      uint32 buf[4];
      const unsigned char inraw[64];

diff --git a/drivers/filter/optset.c b/drivers/filter/optset.c
index f54a5ea1cbe037a5908633d276cca9c1bd92a4c0..a338a47171c8bbceb34ed11a04f3ae361e1f49bd 100644 (file)
--- a/drivers/filter/optset.c
+++ b/drivers/filter/optset.c
@@ -12,6 +12,7 @@
  *   May 2009 (D.C. van Moolenbroek)
  */
 
+#define _MINIX 1
 #include <stdlib.h>
 #include <string.h>
 #include <minix/config.h>

diff --git a/kernel/arch/i386/exception.c b/kernel/arch/i386/exception.c
index 0f54754584750934903b5537cfd0887e9dc90529..0177a2c9014113b9eb485966fbc696ed823407ef 100644 (file)
--- a/kernel/arch/i386/exception.c
+++ b/kernel/arch/i386/exception.c
@@ -147,26 +147,26 @@ PUBLIC void exception_handler(int is_nested, struct exception_frame * frame)
    * them out quickly if the traps are not nested
    */
   if (is_nested) {
-         /*
-          * if a problem occured while copying a message from userspace because
-          * of a wrong pointer supplied by userland, handle it the only way we
-          * can handle it ...
-          */
-         if (((void*)frame->eip >= copy_msg_to_user &&
-                         (void*)frame->eip <= __copy_msg_to_user_end) ||
-                         ((void*)frame->eip >= copy_msg_from_user &&
-                         (void*)frame->eip <= __copy_msg_from_user_end)) {
-                 switch(frame->vector) {
-                 /* these error are expected */
-                 case PAGE_FAULT_VECTOR:
-                 case PROTECTION_VECTOR:
-                         frame->eip = (reg_t) __user_copy_msg_pointer_failure;
-                         return;
-                 default:
-                         minix_panic("Copy involving a user pointer "
-                                         "failed unexpectedly!", NO_NUM);
-                 }
-         }
+       /*
+        * if a problem occured while copying a message from userspace because
+        * of a wrong pointer supplied by userland, handle it the only way we
+        * can handle it ...
+        */
+       if (((void*)frame->eip >= (void*)copy_msg_to_user &&
+                       (void*)frame->eip <= (void*)__copy_msg_to_user_end) ||
+                       ((void*)frame->eip >= (void*)copy_msg_from_user &&
+                       (void*)frame->eip <= (void*)__copy_msg_from_user_end)) {
+               switch(frame->vector) {
+               /* these error are expected */
+               case PAGE_FAULT_VECTOR:
+               case PROTECTION_VECTOR:
+                       frame->eip = (reg_t) __user_copy_msg_pointer_failure;
+                       return;
+               default:
+                       minix_panic("Copy involving a user pointer "
+                                       "failed unexpectedly!", NO_NUM);
+               }
+       }
   }
 
   if(frame->vector == PAGE_FAULT_VECTOR) {