summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>2010-02-24 21:36:16 -0600
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>2010-02-24 21:36:16 -0600
commitf7ed9a65afc69b8b66d610d9328da377fd3bfc68 (patch)
treefd764f1f753cdb2039a88041144c05c26dbecf0a /hw
parent848b7c97b175aab510dcff9c73bf6ab91937ee99 (diff)
Revert "Cygwin/X: Add a timestamp to log messages"
Commit d2322b6309bf15a45002b42e7e6ba3d6b5bfa932 added GetTimeInMillis-based timestamps to the log. This reverts commit ed2fdf0f7c0e0494cb80610a1abb02260d63323f.
Diffstat (limited to 'hw')
-rw-r--r--hw/xwin/winclipboardthread.c2
-rw-r--r--hw/xwin/winmultiwindowwm.c8
-rw-r--r--hw/xwin/winshadddnl.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/hw/xwin/winclipboardthread.c b/hw/xwin/winclipboardthread.c
index 9788d883b..c28f2f10f 100644
--- a/hw/xwin/winclipboardthread.c
+++ b/hw/xwin/winclipboardthread.c
@@ -460,7 +460,7 @@ winClipboardErrorHandler (Display *pDisplay, XErrorEvent *pErr)
static int
winClipboardIOErrorHandler (Display *pDisplay)
{
- ErrorF ("winClipboardIOErrorHandler!\n\n");
+ ErrorF ("\nwinClipboardIOErrorHandler!\n\n");
/* Restart at the main entry point */
longjmp (g_jmpEntry, WIN_JMP_ERROR_IO);
diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
index 6c2812c6f..e2aa1c37b 100644
--- a/hw/xwin/winmultiwindowwm.c
+++ b/hw/xwin/winmultiwindowwm.c
@@ -952,7 +952,7 @@ winMultiWindowXMsgProc (void *pArg)
if (pProcArg->pDisplay == NULL)
{
ErrorF ("winMultiWindowXMsgProc - Could not open display, try: %d, "
- "sleeping: %d\n",
+ "sleeping: %d\n\f",
iRetries + 1, WIN_CONNECT_DELAY);
++iRetries;
sleep (WIN_CONNECT_DELAY);
@@ -1331,7 +1331,7 @@ winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
if (pWMInfo->pDisplay == NULL)
{
ErrorF ("winInitMultiWindowWM - Could not open display, try: %d, "
- "sleeping: %d\n",
+ "sleeping: %d\n\f",
iRetries + 1, WIN_CONNECT_DELAY);
++iRetries;
sleep (WIN_CONNECT_DELAY);
@@ -1434,7 +1434,7 @@ winMultiWindowWMErrorHandler (Display *pDisplay, XErrorEvent *pErr)
static int
winMultiWindowWMIOErrorHandler (Display *pDisplay)
{
- ErrorF ("winMultiWindowWMIOErrorHandler!\n\n");
+ ErrorF ("\nwinMultiWindowWMIOErrorHandler!\n\n");
if (g_shutdown)
pthread_exit(NULL);
@@ -1474,7 +1474,7 @@ winMultiWindowXMsgProcErrorHandler (Display *pDisplay, XErrorEvent *pErr)
static int
winMultiWindowXMsgProcIOErrorHandler (Display *pDisplay)
{
- ErrorF ("winMultiWindowXMsgProcIOErrorHandler!\n\n");
+ ErrorF ("\nwinMultiWindowXMsgProcIOErrorHandler!\n\n");
/* Restart at the main entry point */
longjmp (g_jmpXMsgProcEntry, WIN_JMP_ERROR_IO);
diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c
index e78fbd9e6..ef5c21469 100644
--- a/hw/xwin/winshadddnl.c
+++ b/hw/xwin/winshadddnl.c
@@ -554,7 +554,7 @@ winFinishCreateWindowsWindowDDNL (WindowPtr pWin)
int iWidth, iHeight;
int iX, iY;
- winDebug ("winFinishCreateWindowsWindowDDNL!\n\n");
+ winDebug ("\nwinFinishCreateWindowsWindowDDNL!\n\n");
iX = pWin->drawable.x + GetSystemMetrics (SM_XVIRTUALSCREEN);
iY = pWin->drawable.y + GetSystemMetrics (SM_YVIRTUALSCREEN);