[Tinyos-2-commits] CVS: tinyos-2.x/tos/types TinyError.h,1.6,1.7

[Kevin Klues]

Update of /cvsroot/tinyos/tinyos-2.x/tos/types
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9748/tos/types

Modified Files:
	TinyError.h 
Log Message:
Update to allow header files to be processed via standard gcc and not have to run through ncc first (problem was in the usage of @combine, etc. in these files)

Index: TinyError.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/types/TinyError.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TinyError.h	8 Oct 2007 20:10:08 -0000	1.6
--- TinyError.h	27 Mar 2008 00:52:02 -0000	1.7
***************
*** 32,35 ****
--- 32,41 ----
  #define TINY_ERROR_H_INCLUDED
  
+ #ifdef NESC
+ #define NESC_COMBINE(x) @combine(x)
+ #else
+ #define NESC_COMBINE(x)
+ #endif
+ 
  enum {
    SUCCESS        = 0,          
***************
*** 45,49 ****
  };
  
! typedef uint8_t error_t @combine("ecombine");
  
  error_t ecombine(error_t r1, error_t r2)
--- 51,55 ----
  };
  
! typedef uint8_t error_t NESC_COMBINE("ecombine");
  
  error_t ecombine(error_t r1, error_t r2)