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

[John Regehr]

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

Modified Files:
	annots_stage1.h 
Log Message:
hack to avoid breaking the build for people not yet using deputy with NTS

Index: annots_stage1.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/include/annots_stage1.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** annots_stage1.h	2 Jul 2008 18:26:16 -0000	1.11
--- annots_stage1.h	2 Jul 2008 18:44:09 -0000	1.12
***************
*** 4,11 ****
  #define ANNOTS_STAGE1_INCLUDED
  
! // define away two obsolete annotations
  #define BOUND(x,y)
  #define SINGLE
  
  #if NESC < 130 
  
--- 4,16 ----
  #define ANNOTS_STAGE1_INCLUDED
  
! // JDR temporary code: define away two obsolete annotations
  #define BOUND(x,y)
  #define SINGLE
  
+ // JDR temporary code: define away NTS in unsafe mode
+ #ifndef SAFE_TINYOS
+ #define NTS
+ #endif
+ 
  #if NESC < 130