Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / safe / include / deputy / checks.h

diff --git a/tos/lib/safe/include/deputy/checks.h b/tos/lib/safe/include/deputy/checks.h
index 32d85f37ef77a412b15345401e148197babdde2e..f0582b8642264bd12bed9f6d64dc79fd3d041c97 100644 (file)
--- a/tos/lib/safe/include/deputy/checks.h
+++ b/tos/lib/safe/include/deputy/checks.h
@@ -50,21 +50,13 @@ extern asmlinkage noreturn
 void deputy_fail_noreturn(__LOCATION__FORMALS);
 
 extern asmlinkage noreturn
-void deputy_fail_noreturn_fast(void);
+void deputy_fail_noreturn_fast(__LOCATION__FORMALS);
 
 /* Search for a NULL starting at e and return its index */
 extern asmlinkage
 int deputy_findnull(const void *e1, unsigned int sz);
 
-//Define deputy_memset, which we use to initialize locals
-//FIXME:  We should set __deputy_memset = __builtin_memset to take advantage 
-//of optimizations.  How do we do that in a portable way?
-#if defined(memset) && !defined(IN_DEPUTY_LIBRARY)
 #define __deputy_memset memset
-#else
-extern asmlinkage
-void *__deputy_memset(void *s, int c, unsigned int n);
-#endif
 
 #if  defined(DEPUTY_FAST_CHECKS)
    #define deputy_fail deputy_fail_noreturn_fast