[Shallows-commits] shallows/include/shallows/utils Timer.hpp, 1.4, 1.5

[Jon H. <jon...@us...>]

Update of /cvsroot/shallows/shallows/include/shallows/utils
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23384/include/shallows/utils

Modified Files:
	Timer.hpp 
Log Message:
gcc defines __unix, not UNIX

Index: Timer.hpp
===================================================================
RCS file: /cvsroot/shallows/shallows/include/shallows/utils/Timer.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Timer.hpp	25 Sep 2005 21:34:26 -0000	1.4
--- Timer.hpp	15 Sep 2006 09:16:33 -0000	1.5
***************
*** 33,37 ****
  #include "shallows/config.h"
  
! #ifdef UNIX
  #include <sys/time.h>
  #include <unistd.h>
--- 33,37 ----
  #include "shallows/config.h"
  
! #ifdef __unix
  #include <sys/time.h>
  #include <unistd.h>
***************
*** 66,70 ****
      double static getCurrentTime() {
  
! #ifdef UNIX
    struct timeval tv;
    struct timezone tz;
--- 66,70 ----
      double static getCurrentTime() {
  
! #ifdef __unix
    struct timeval tv;
    struct timezone tz;