aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2000-12-13 16:41:29 +0000
committerEric Andersen <andersen@codepoet.org>2000-12-13 16:41:29 +0000
commit21125543e189a88ae98a48248014839db40f4d61 (patch)
tree54a624d1c2c18d6945b495840f34442e2b8d8ccb
parent4836fd44f037c226e5eee83224cf090406602fae (diff)
downloadbusybox-w32-21125543e189a88ae98a48248014839db40f4d61.tar.gz
busybox-w32-21125543e189a88ae98a48248014839db40f4d61.tar.bz2
busybox-w32-21125543e189a88ae98a48248014839db40f4d61.zip
A couple of updates to fix some minor cross compiling issues
-rw-r--r--init.c1
-rw-r--r--init/init.c1
-rw-r--r--insmod.c6
-rw-r--r--modutils/insmod.c6
4 files changed, 6 insertions, 8 deletions
diff --git a/init.c b/init.c
index 75d2f33b9..0e9b74195 100644
--- a/init.c
+++ b/init.c
@@ -88,7 +88,6 @@ struct serial_struct {
88#include <sys/reboot.h> 88#include <sys/reboot.h>
89 #define init_reboot(magic) reboot(magic) 89 #define init_reboot(magic) reboot(magic)
90#else 90#else
91 extern int reboot __P ((int __howto));
92 #define init_reboot(magic) reboot(0xfee1dead, 672274793, magic) 91 #define init_reboot(magic) reboot(0xfee1dead, 672274793, magic)
93#endif 92#endif
94#endif 93#endif
diff --git a/init/init.c b/init/init.c
index 75d2f33b9..0e9b74195 100644
--- a/init/init.c
+++ b/init/init.c
@@ -88,7 +88,6 @@ struct serial_struct {
88#include <sys/reboot.h> 88#include <sys/reboot.h>
89 #define init_reboot(magic) reboot(magic) 89 #define init_reboot(magic) reboot(magic)
90#else 90#else
91 extern int reboot __P ((int __howto));
92 #define init_reboot(magic) reboot(0xfee1dead, 672274793, magic) 91 #define init_reboot(magic) reboot(0xfee1dead, 672274793, magic)
93#endif 92#endif
94#endif 93#endif
diff --git a/insmod.c b/insmod.c
index 0b12c694d..f2f1e8028 100644
--- a/insmod.c
+++ b/insmod.c
@@ -78,7 +78,7 @@
78#ifndef MODUTILS_MODULE_H 78#ifndef MODUTILS_MODULE_H
79#define MODUTILS_MODULE_H 1 79#define MODUTILS_MODULE_H 1
80 80
81#ident "$Id: insmod.c,v 1.31 2000/12/07 19:56:48 markw Exp $" 81#ident "$Id: insmod.c,v 1.32 2000/12/13 16:41:29 andersen Exp $"
82 82
83/* This file contains the structures used by the 2.0 and 2.1 kernels. 83/* This file contains the structures used by the 2.0 and 2.1 kernels.
84 We do not use the kernel headers directly because we do not wish 84 We do not use the kernel headers directly because we do not wish
@@ -284,7 +284,7 @@ int delete_module(const char *);
284#ifndef MODUTILS_OBJ_H 284#ifndef MODUTILS_OBJ_H
285#define MODUTILS_OBJ_H 1 285#define MODUTILS_OBJ_H 1
286 286
287#ident "$Id: insmod.c,v 1.31 2000/12/07 19:56:48 markw Exp $" 287#ident "$Id: insmod.c,v 1.32 2000/12/13 16:41:29 andersen Exp $"
288 288
289/* The relocatable object is manipulated using elfin types. */ 289/* The relocatable object is manipulated using elfin types. */
290 290
@@ -859,7 +859,7 @@ arch_apply_relocation(struct obj_file *f,
859 break; 859 break;
860 860
861 default: 861 default:
862 printf("Warning: unhandled reloc %d\n",ELF32_R_TYPE(rel->r_info)); 862 printf("Warning: unhandled reloc %d\n",(int)ELF32_R_TYPE(rel->r_info));
863 ret = obj_reloc_unhandled; 863 ret = obj_reloc_unhandled;
864 break; 864 break;
865 } 865 }
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 0b12c694d..f2f1e8028 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -78,7 +78,7 @@
78#ifndef MODUTILS_MODULE_H 78#ifndef MODUTILS_MODULE_H
79#define MODUTILS_MODULE_H 1 79#define MODUTILS_MODULE_H 1
80 80
81#ident "$Id: insmod.c,v 1.31 2000/12/07 19:56:48 markw Exp $" 81#ident "$Id: insmod.c,v 1.32 2000/12/13 16:41:29 andersen Exp $"
82 82
83/* This file contains the structures used by the 2.0 and 2.1 kernels. 83/* This file contains the structures used by the 2.0 and 2.1 kernels.
84 We do not use the kernel headers directly because we do not wish 84 We do not use the kernel headers directly because we do not wish
@@ -284,7 +284,7 @@ int delete_module(const char *);
284#ifndef MODUTILS_OBJ_H 284#ifndef MODUTILS_OBJ_H
285#define MODUTILS_OBJ_H 1 285#define MODUTILS_OBJ_H 1
286 286
287#ident "$Id: insmod.c,v 1.31 2000/12/07 19:56:48 markw Exp $" 287#ident "$Id: insmod.c,v 1.32 2000/12/13 16:41:29 andersen Exp $"
288 288
289/* The relocatable object is manipulated using elfin types. */ 289/* The relocatable object is manipulated using elfin types. */
290 290
@@ -859,7 +859,7 @@ arch_apply_relocation(struct obj_file *f,
859 break; 859 break;
860 860
861 default: 861 default:
862 printf("Warning: unhandled reloc %d\n",ELF32_R_TYPE(rel->r_info)); 862 printf("Warning: unhandled reloc %d\n",(int)ELF32_R_TYPE(rel->r_info));
863 ret = obj_reloc_unhandled; 863 ret = obj_reloc_unhandled;
864 break; 864 break;
865 } 865 }