diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:39 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:39 +0000 |
| commit | 3f3b1fbe531e0c1ab3b74396bf4e78db861c8bbc (patch) | |
| tree | 267360093b4f702aa1d2d07f47493e3353fb48e5 /Clock.c | |
| parent | 850f3f26301d2768b92d0d1de38e0cef467761c0 (diff) | |
Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGElg3d-masterlg3d-eventlg3d-dev-0-7-1lg3d-dev-0-7-0lg3d-dev-0-6-latestlg3d-dev-0-6-2lg3d-dev-0-6-1-latestlg3d-dev-0-6-1-currentlg3d-dev-0-6-1-1lg3d-dev-0-6-1lg3dXORG-6_8-branchCOMPOSITEWRAP
Diffstat (limited to 'Clock.c')
| -rw-r--r-- | Clock.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,5 @@ /* $Xorg: Clock.c,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ */ +/* $XdotOrg$ */ /*********************************************************** @@ -46,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/xclock/Clock.c,v 3.26 2003/10/25 00:52:37 dawes Exp $ */ +/* $XFree86: xc/programs/xclock/Clock.c,v 3.25 2003/07/04 16:24:30 eich Exp $ */ #include <X11/Xlib.h> #include <X11/StringDefs.h> @@ -82,7 +83,7 @@ SOFTWARE. #define max(a, b) ((a) > (b) ? (a) : (b)) #define min(a, b) ((a) < (b) ? (a) : (b)) -#define abs(a) ((a) < 0 ? -(a) : (a)) +/* #define abs(a) ((a) < 0 ? -(a) : (a)) */ /* Initialization of defaults */ |