From 87eeebef45846fe5f1c22e272d6507d714ef2fb5 Mon Sep 17 00:00:00 2001 From: "rjc%netscape.com" Date: Fri, 30 Apr 1999 23:17:08 +0000 Subject: [PATCH] Fix bug # 4357 where FTP is broken on the Mac. This is basically the same bug and same bug fix as bug # 3405. Somebody needs to fix this for real... I think we should make Kathy Brade do it (Hi Kathy!) as she introduced the bug. Anyway, approval=chofmann. --- lib/mac/Misc/mactime.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/mac/Misc/mactime.c b/lib/mac/Misc/mactime.c index 9fb1c12aaad..5e53f7c6bae 100644 --- a/lib/mac/Misc/mactime.c +++ b/lib/mac/Misc/mactime.c @@ -40,6 +40,7 @@ _END_C_LIB_DECL #include "xp_mcom.h" /* prototypes for GetTimeMac, Mactime, Macmktime, Macctime, Maclocaltime, Macgmtime */ #undef ctime +#undef mktime // Because serial port and SLIP conflict with ReadXPram calls, // we cache the call here