From: MySQL y. m. <my...@us...> - 2006-05-22 12:49:59
|
Update of /cvsroot/yassl/yassl/src In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14472 Modified Files: timer.cpp Log Message: Don't include files from within namespace Index: timer.cpp =================================================================== RCS file: /cvsroot/yassl/yassl/src/timer.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** timer.cpp 28 Mar 2006 23:56:40 -0000 1.1.1.1 --- timer.cpp 22 May 2006 12:49:55 -0000 1.2 *************** *** 27,37 **** #include "timer.hpp" namespace yaSSL { #ifdef _WIN32 - #define WIN32_LEAN_AND_MEAN - #include <windows.h> - timer_d timer() { --- 27,41 ---- #include "timer.hpp" + #ifdef _WIN32 + #define WIN32_LEAN_AND_MEAN + #include <windows.h> + #else + #include <sys/time.h> + #endif + namespace yaSSL { #ifdef _WIN32 timer_d timer() { *************** *** 58,63 **** #else // _WIN32 - #include <sys/time.h> - timer_d timer() { --- 62,65 ---- |