From 12b2eb58eed568d9df4949e5faac208998038b9a Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Wed, 17 Feb 1999 18:14:58 +0000 Subject: [PATCH] Renamed calls to FE_SetTimeout to IL_SetTimeout to avoid dll linkage problem on unix git-svn-id: svn://10.0.0.236/trunk@20987 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/libimg/src/gif.cpp | 4 ++-- mozilla/modules/libimg/src/if.cpp | 4 ++-- mozilla/modules/libimg/src/if.h | 6 +++--- mozilla/modules/libimg/src/ipng.cpp | 2 +- mozilla/modules/libimg/src/jpeg.cpp | 10 +++++----- mozilla/modules/libimg/src/scale.cpp | 4 ++-- mozilla/modules/libimg/src/xpcompat.cpp | 14 +++++++------- mozilla/modules/libimg/src/xpcompat.h | 4 ++-- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/mozilla/modules/libimg/src/gif.cpp b/mozilla/modules/libimg/src/gif.cpp index c3fc851e81f..c6a182a799d 100644 --- a/mozilla/modules/libimg/src/gif.cpp +++ b/mozilla/modules/libimg/src/gif.cpp @@ -1425,7 +1425,7 @@ il_gif_write(il_container *ic, const uint8 *buf, int32 len) gs->delay_time = MINIMUM_DELAY_TIME; if (gs->delay_time){ gs->delay_timeout = - FE_SetTimeout(gif_delay_time_callback, gs, gs->delay_time); + IL_SetTimeout(gif_delay_time_callback, gs, gs->delay_time); /* Essentially, tell the decoder state machine to wait forever. The timeout callback routine will wake up the @@ -1557,7 +1557,7 @@ il_gif_abort(il_container *ic) /* Clear any pending timeouts */ if (gs->delay_timeout) { - FE_ClearTimeout(gs->delay_timeout); + IL_ClearTimeout(gs->delay_timeout); gs->delay_timeout = NULL; } diff --git a/mozilla/modules/libimg/src/if.cpp b/mozilla/modules/libimg/src/if.cpp index 7c01118784c..cba56cb2b85 100644 --- a/mozilla/modules/libimg/src/if.cpp +++ b/mozilla/modules/libimg/src/if.cpp @@ -1065,7 +1065,7 @@ il_image_abort(il_container *ic) /* Clear any pending timeouts */ if (ic->row_output_timeout) { - FE_ClearTimeout(ic->row_output_timeout); + IL_ClearTimeout(ic->row_output_timeout); ic->row_output_timeout = NULL; } } @@ -1382,7 +1382,7 @@ il_image_complete(il_container *ic) /* Clear any pending timeouts */ if (ic->row_output_timeout) { - FE_ClearTimeout(ic->row_output_timeout); + IL_ClearTimeout(ic->row_output_timeout); ic->row_output_timeout = NULL; } diff --git a/mozilla/modules/libimg/src/if.h b/mozilla/modules/libimg/src/if.h index f56992e1fc1..dda2dfed688 100644 --- a/mozilla/modules/libimg/src/if.h +++ b/mozilla/modules/libimg/src/if.h @@ -18,7 +18,7 @@ /* if.h --- Top-level image library internal routines * - * $Id: if.h,v 3.4 1998-11-10 00:07:58 pnunn%netscape.com Exp $ + * $Id: if.h,v 3.5 1999-02-17 18:14:57 kipp%netscape.com Exp $ */ #ifndef _if_h @@ -72,9 +72,9 @@ typedef void (*TimeoutCallbackFunction) (void * closure); extern void * -FE_SetTimeout(TimeoutCallbackFunction func, void * closure, uint32 msecs); +IL_SetTimeout(TimeoutCallbackFunction func, void * closure, uint32 msecs); extern void -FE_ClearTimeout(void *timer_id); +IL_ClearTimeout(void *timer_id); PR_END_EXTERN_C #endif /********************************* in xpcompat.h *************************************/ diff --git a/mozilla/modules/libimg/src/ipng.cpp b/mozilla/modules/libimg/src/ipng.cpp index c3ab44333d5..4cc43fa91e0 100644 --- a/mozilla/modules/libimg/src/ipng.cpp +++ b/mozilla/modules/libimg/src/ipng.cpp @@ -237,7 +237,7 @@ il_png_complete(il_container *ic) ipng_ptr->delay_time = MINIMUM_DELAY_TIME ; if (ipng_ptr->delay_time){ ipng_ptr->delay_timeout = - FE_SetTimeout(png_delay_time_callback, ipng_ptr, ipng_ptr->delay_time); + IL_SetTimeout(png_delay_time_callback, ipng_ptr, ipng_ptr->delay_time); /* Essentially, tell the decoder state machine to wait forever. The delay_time callback routine will wake up the diff --git a/mozilla/modules/libimg/src/jpeg.cpp b/mozilla/modules/libimg/src/jpeg.cpp index 3329ebec05e..938db6a9dd1 100644 --- a/mozilla/modules/libimg/src/jpeg.cpp +++ b/mozilla/modules/libimg/src/jpeg.cpp @@ -18,7 +18,7 @@ /* * jpeg.c --- Glue code to Independent JPEG Group decoder library - * $Id: jpeg.cpp,v 3.4 1998-12-17 22:16:27 pnunn%netscape.com Exp $ + * $Id: jpeg.cpp,v 3.5 1999-02-17 18:14:58 kipp%netscape.com Exp $ */ @@ -694,7 +694,7 @@ jpeg_timeout_callback(void *closure) } done: - js->timeout = FE_SetTimeout(jpeg_timeout_callback, js, delay); + js->timeout = IL_SetTimeout(jpeg_timeout_callback, js, delay); } /* @@ -860,7 +860,7 @@ il_jpeg_write(il_container *ic, const unsigned char *buf, int32 len) delay = JPEG_TIMEOUT_DELAY; } - js->timeout = FE_SetTimeout(jpeg_timeout_callback, js, delay); + js->timeout = IL_SetTimeout(jpeg_timeout_callback, js, delay); } @@ -908,7 +908,7 @@ il_jpeg_write(il_container *ic, const unsigned char *buf, int32 len) /* Clear any pending timeouts */ if (js->timeout) { - FE_ClearTimeout(js->timeout); + IL_ClearTimeout(js->timeout); js->timeout = NULL; } @@ -955,7 +955,7 @@ il_jpeg_abort(il_container *ic) /* Clear any pending timeouts */ if (js->timeout) { - FE_ClearTimeout(js->timeout); + IL_ClearTimeout(js->timeout); js->timeout = NULL; } diff --git a/mozilla/modules/libimg/src/scale.cpp b/mozilla/modules/libimg/src/scale.cpp index 7676db2d8a2..5825fe80e52 100644 --- a/mozilla/modules/libimg/src/scale.cpp +++ b/mozilla/modules/libimg/src/scale.cpp @@ -71,7 +71,7 @@ il_timeout_callback(void *closure) delay = (ic->pass > 1) ? 2 * ROW_OUTPUT_DELAY : ROW_OUTPUT_DELAY; - ic->row_output_timeout = FE_SetTimeout(il_timeout_callback, ic, delay); + ic->row_output_timeout = IL_SetTimeout(il_timeout_callback, ic, delay); } /*----------------------------------------------------------------------------- @@ -134,7 +134,7 @@ il_partial( if (!ic->row_output_timeout){ /* Set a timer that will actually display the image data. */ - ic->row_output_timeout = FE_SetTimeout(il_timeout_callback, ic, + ic->row_output_timeout = IL_SetTimeout(il_timeout_callback, ic, ROW_OUTPUT_INITIAL_DELAY); } } diff --git a/mozilla/modules/libimg/src/xpcompat.cpp b/mozilla/modules/libimg/src/xpcompat.cpp index fdbe0f58343..fe0fb9acc4f 100644 --- a/mozilla/modules/libimg/src/xpcompat.cpp +++ b/mozilla/modules/libimg/src/xpcompat.cpp @@ -641,7 +641,7 @@ void SyncTimeoutPeriod(DWORD dwTickCount) /* this function should register a function that will * be called after the specified interval of time has * elapsed. This function should return an id - * that can be passed to FE_ClearTimeout to cancel + * that can be passed to IL_ClearTimeout to cancel * the Timeout request. * * A) Timeouts never fail to trigger, and @@ -657,7 +657,7 @@ void SyncTimeoutPeriod(DWORD dwTickCount) * msecs: The number of milli-seconds in the interval */ void * -FE_SetTimeout(TimeoutCallbackFunction func, void * closure, uint32 msecs) +IL_SetTimeout(TimeoutCallbackFunction func, void * closure, uint32 msecs) { WinTime * pTime = new WinTime; if(!pTime) @@ -717,7 +717,7 @@ FE_SetTimeout(TimeoutCallbackFunction func, void * closure, uint32 msecs) * has already expired. */ void -FE_ClearTimeout(void * pStuff) +IL_ClearTimeout(void * pStuff) { WinTime * pTimer = (WinTime *) pStuff; @@ -767,7 +767,7 @@ static void wfe_ProcessTimeouts(DWORD dwNow) BOOL bCalledSync = FALSE; - // Set the hack, such that when FE_ClearTimeout + // Set the hack, such that when IL_ClearTimeout // calls SyncTimeoutPeriod, that GetTickCount() // overhead is not incurred. dwSyncHack = dwNow; @@ -781,7 +781,7 @@ static void wfe_ProcessTimeouts(DWORD dwNow) // Clear the timer. // Period synced. - FE_ClearTimeout(p); + IL_ClearTimeout(p); bCalledSync = TRUE; // Reset the loop (can't look at p->pNext now, and called @@ -806,14 +806,14 @@ static void wfe_ProcessTimeouts(DWORD dwNow) } #else NS_EXPORT void* -FE_SetTimeout(TimeoutCallbackFunction func, void * closure, uint32 msecs) +IL_SetTimeout(TimeoutCallbackFunction func, void * closure, uint32 msecs) { return il_ss->SetTimeout((ilTimeoutCallbackFunction)func, closure, msecs); } NS_EXPORT void -FE_ClearTimeout(void *timer_id) +IL_ClearTimeout(void *timer_id) { il_ss->ClearTimeout(timer_id); } diff --git a/mozilla/modules/libimg/src/xpcompat.h b/mozilla/modules/libimg/src/xpcompat.h index 796ac818f3f..0d549bc83dc 100644 --- a/mozilla/modules/libimg/src/xpcompat.h +++ b/mozilla/modules/libimg/src/xpcompat.h @@ -147,9 +147,9 @@ extern char * NET_BACat (char **dest, size_t dest_length, const char *src, size extern char * NET_SACopy (char **dest, const char *src); extern char * NET_SACat (char **dest, const char *src); -NS_EXPORT void* FE_SetTimeout(TimeoutCallbackFunction func, void * closure, uint32 msecs); +NS_EXPORT void* IL_SetTimeout(TimeoutCallbackFunction func, void * closure, uint32 msecs); -NS_EXPORT void FE_ClearTimeout(void *timer_id); +NS_EXPORT void IL_ClearTimeout(void *timer_id); PR_END_EXTERN_C