CVS commit: xsrc/xfree/xc/programs/Xserver/os

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Sun May 29 22:57:41 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/os: utils.c

Log Message:
add memleak.h for CheckMemory


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/xfree/xc/programs/Xserver/os/utils.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/xfree/xc/programs/Xserver/os/utils.c
diff -u xsrc/xfree/xc/programs/Xserver/os/utils.c:1.8 xsrc/xfree/xc/programs/Xserver/os/utils.c:1.9
--- xsrc/xfree/xc/programs/Xserver/os/utils.c:1.8	Sun Jan 27 15:31:16 2008
+++ xsrc/xfree/xc/programs/Xserver/os/utils.c	Sun May 29 18:57:41 2011
@@ -204,6 +204,7 @@
 #define MEM_FAIL_SCALE 10
 long Memory_fail = 0;
 #include stdlib.h  /* for random() */
+#includeutil/memleak/memleak.h
 #endif
 
 #ifdef sgi

CVS commit: xsrc/xfree/xc/programs/Xserver/os

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jun  4 02:24:45 UTC 2010

Modified Files:
xsrc/xfree/xc/programs/Xserver/os: GetTimeInMillis.c

Log Message:
backout the xfree86 4.5 change to GetTimeInMillis() that returns
relative times instead of absolute times.  it causes problems in
openmotif at the very least, and is not what xorg has done.

from Cliff Wright in PR#39209.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/xfree/xc/programs/Xserver/os/GetTimeInMillis.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/xfree/xc/programs/Xserver/os/GetTimeInMillis.c
diff -u xsrc/xfree/xc/programs/Xserver/os/GetTimeInMillis.c:1.5 xsrc/xfree/xc/programs/Xserver/os/GetTimeInMillis.c:1.6
--- xsrc/xfree/xc/programs/Xserver/os/GetTimeInMillis.c:1.5	Fri Mar 18 14:55:16 2005
+++ xsrc/xfree/xc/programs/Xserver/os/GetTimeInMillis.c	Fri Jun  4 02:24:45 2010
@@ -5,19 +5,7 @@
 GetTimeInMillis(void)
 {
 struct timeval  tp;
-register CARD32 val;
-register INT32 diff;
-static CARD32 oldval = 0;
-static CARD32 time = 0;
 
 X_GETTIMEOFDAY(tp);
-val = (tp.tv_sec * 1000) + (tp.tv_usec / 1000);
-if (oldval) {
-	diff = val - oldval;
-	if (diff  0)
-	time += diff;
-}
-oldval = val;
-
-return time;
+return(tp.tv_sec * 1000) + (tp.tv_usec / 1000);
 }