diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-03-28 01:21:00 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-03-28 01:21:00 +0000 |
| commit | 7deaaa797cf8e7ca71e9b34fa6f413d1ed2b3dab (patch) | |
| tree | 68207e778570383e7f4ace7d1ff8cea27bb67ce1 /mi | |
| parent | 7342dbe4b2108827eaf30993ceeecbd828da2290 (diff) | |
Big old pile of warning fixes.
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/miarc.c | 6 | ||||
| -rw-r--r-- | mi/mioverlay.c | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mi/miarc.c b/mi/miarc.c index 1e51c5d59..f6abb3ba2 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xserver/xorg/mi/miarc.c,v 1.6 2005/07/03 08:53:51 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/mi/miarc.c,v 1.7 2006/02/15 19:05:54 ajax Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.14 2003/10/29 22:57:48 tsi Exp $ */ /*********************************************************** @@ -112,12 +112,12 @@ ICEILTEMPDECL #endif #ifdef USE_INLINE -inline static const int max (const int x, const int y) +inline static int max (const int x, const int y) { return x>y? x:y; } -inline static const int min (const int x, const int y) +inline static int min (const int x, const int y) { return x<y? x:y; } diff --git a/mi/mioverlay.c b/mi/mioverlay.c index 9820cc65e..88b3bf81d 100644 --- a/mi/mioverlay.c +++ b/mi/mioverlay.c @@ -2029,7 +2029,6 @@ HasUnderlayChildren(WindowPtr pWin) static Bool CollectUnderlayChildrenRegions(WindowPtr pWin, RegionPtr pReg) { - ScreenPtr pScreen = pWin->drawable.pScreen; WindowPtr pChild; miOverlayTreePtr pTree; Bool hasUnderlay; |