[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/harvard/spaulding/src/samplingToDataStore SampleChunk.h, 1.1.1.1, 1.2

[Konrad Lorincz]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/samplingToDataStore
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17935/src/samplingToDataStore

Modified Files:
	SampleChunk.h 
Log Message:
renamed type time_t to uint32_t because of conflicts with the builtin time_t definition

Index: SampleChunk.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/samplingToDataStore/SampleChunk.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SampleChunk.h	22 Aug 2007 00:43:55 -0000	1.1.1.1
--- SampleChunk.h	17 Dec 2007 20:47:41 -0000	1.2
***************
*** 44,51 ****
  
  /* Number of samples in a sample chunk */
! #define SAMPLE_CHUNK_NUM_SAMPLES ((BLOCK_DATA_SIZE - 2*sizeof(time_t) - 2*sizeof(uint16_t) - sizeof(channelID_t)*MCS_MAX_NBR_CHANNELS_SAMPLED) / sizeof(sample_t))
  
  /* Number of bytes in a sample chunk if packed */
! #define SAMPLE_CHUNK_PACKED_NUM_BYTES ((BLOCK_DATA_SIZE - sizeof(time_t) - sizeof(uint16_t) - sizeof(channelID_t)*MCS_MAX_NBR_CHANNELS_SAMPLED))
  
  /* DO NOT CHANGE THIS STRUCTURE without modifying definitions above
--- 44,51 ----
  
  /* Number of samples in a sample chunk */
! #define SAMPLE_CHUNK_NUM_SAMPLES ((BLOCK_DATA_SIZE - 2*sizeof(uint32_t) - 2*sizeof(uint16_t) - sizeof(channelID_t)*MCS_MAX_NBR_CHANNELS_SAMPLED) / sizeof(sample_t))
  
  /* Number of bytes in a sample chunk if packed */
! #define SAMPLE_CHUNK_PACKED_NUM_BYTES ((BLOCK_DATA_SIZE - sizeof(uint32_t) - sizeof(uint16_t) - sizeof(channelID_t)*MCS_MAX_NBR_CHANNELS_SAMPLED))
  
  /* DO NOT CHANGE THIS STRUCTURE without modifying definitions above
***************
*** 53,58 ****
   */
  typedef struct SampleChunk {
!     time_t      localTime;
!     time_t      globalTime;
      uint16_t    timeSynched;         // true or false 
      uint16_t    nbrMultiChanSamples; // Number of samples
--- 53,58 ----
   */
  typedef struct SampleChunk {
!     uint32_t    localTime;
!     uint32_t    globalTime;
      uint16_t    timeSynched;         // true or false 
      uint16_t    nbrMultiChanSamples; // Number of samples