[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/safe/include annots_stage1.h, 1.1, 1.2

[John Regehr]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/include
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19092/include

Modified Files:
	annots_stage1.h 
Log Message:
annotation tweak

Index: annots_stage1.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/include/annots_stage1.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** annots_stage1.h	14 Feb 2008 22:47:57 -0000	1.1
--- annots_stage1.h	14 Feb 2008 23:38:27 -0000	1.2
***************
*** 11,14 ****
--- 11,22 ----
  #define NONNULL                                @nonnull()
  
+ #else // NESC < 130
+ 
+ #ifdef SAFE_TINYOS
+ #error Safe TinyOS requires nesC >= 1.3.0
+ #endif
+ 
+ #endif // NESC version check
+ 
  #ifdef SAFE_TINYOS
  #define TCAST(__type,__expr)                   ((__type)((void * __DEPUTY_TRUSTED __DEPUTY_COPYTYPE)(__expr)))
***************
*** 19,27 ****
  #endif
  
- #else // NESC < 130
- 
- #ifdef SAFE_TINYOS
- #error Safe TinyOS requires nesC >= 1.3.0
- #endif
- 
- #endif
--- 27,28 ----