Oops, sorry. I tried doing the diff inside of WinCVS. Didn't you tell me once how to do the diff's right from WinCVS? After looking through the APR code I came to the conclusion that minor deviations could be made with ifdef's but major rewrites would require our own file. So far we have been able to get by with just minor changes to the unix implementation. We do have some major rewrites that will be coming (locks, threadproc, etc). As we get pieces working, I will post the changes.
thanks, Brad >>> "William A. Rowe, Jr." <[EMAIL PROTECTED]> Thursday, July 26, 2001 1:33:53 >>> PM >>> Brad... you know better than submit context diffs :) Can you send us the diff -u3 ? Please note, if you have a significant change (except in sendfile, which is already so fragmented to be completely illegible :) please watch for the appropriate places to drop a foo/netware/ derivation. For minor changes like this, they most likely belong right in foo/unix/. Figure your platform search path (within building apr itself) should go through include/arch/netware:include/arch/unix:include Bill ----- Original Message ----- From: "Brad Nicholes" <[EMAIL PROTECTED]> To: <dev@apr.apache.org> Sent: Thursday, July 26, 2001 2:10 PM Subject: [PATCH] NetWare port of time.c This is just the first of the changes for the NetWare port. :) Brad ―------------------------------------------- cvs diff time.c (in directory D:\tempapache\apr\time\unix\) Index: time.c =================================================================== RCS file: /home/cvspublic/apr/time/unix/time.c,v retrieving revision 1.49 diff -r1.49 time.c 114a115,120 > #ifdef NETWARE > uint64_t usec; > > NXGetTime(NX_SINCE_1970, NX_USECONDS, &usec); > return usec; > #else 117a124 > #endif
--- time.c Thu Jul 26 20:59:59 2001 +++ time.c-new Thu Jul 26 18:51:36 2001 @@ -112,9 +112,16 @@ /* NB NB NB NB This returns GMT!!!!!!!!!! */ apr_time_t apr_time_now(void) { +#ifdef NETWARE + uint64_t usec; + + NXGetTime(NX_SINCE_1970, NX_USECONDS, &usec); + return usec; +#else struct timeval tv; gettimeofday(&tv, NULL); return tv.tv_sec * APR_USEC_PER_SEC + tv.tv_usec; +#endif } static void explode_time(apr_exploded_time_t *xt, apr_time_t t,