diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:32:25 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:32:25 +0000 |
| commit | 4bc93313335f55da63e8431a396d65a1115c8e49 (patch) | |
| tree | 4dc4b40c3abbeb0df6175dda9c7256e44a626a6c /Clock.c | |
| parent | c133bf70e69202ea5ba5636a5279cd4512e5fc29 (diff) | |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGECYGWIN-PRE-6_8_0-MERGECYGWIN-HEAD-MERGECYGWIN-HEAD-LAST-MERGE
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: xc/programs/xclock/Clock.c,v 1.1.4.4.4.1 2004/03/04 17:48:54 eich Exp $ */ /*********************************************************** @@ -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 */ |