[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/harvard/spaulding/src/sampling/testSampling TestSamplingM.nc, 1.1.1.1, 1.2

[Konrad Lorincz]

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

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

Index: TestSamplingM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/sampling/testSampling/TestSamplingM.nc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TestSamplingM.nc	22 Aug 2007 00:43:54 -0000	1.1.1.1
--- TestSamplingM.nc	17 Dec 2007 20:47:41 -0000	1.2
***************
*** 65,70 ****
      enum {NBR_SAMPLES_TO_COLLECT = 5};
      norace uint16_t cntSamples;   
!     time_t startTime = 0;
!     time_t elapsedTime = 0;
      sample_t buffSamples[MERCURY_NBR_CHANS];
  
--- 65,70 ----
      enum {NBR_SAMPLES_TO_COLLECT = 5};
      norace uint16_t cntSamples;   
!     uint32_t startTime = 0;
!     uint32_t elapsedTime = 0;
      sample_t buffSamples[MERCURY_NBR_CHANS];