From 22e912f7338ee41bd0f84f4330f4e8bc0c7501d9 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Mon, 17 Nov 2003 19:03:47 +0000 Subject: merge XFree86 4.3.0.1 to -CURRENT --- src/screen.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/screen.h') diff --git a/src/screen.h b/src/screen.h index c47bc70..b5f7eb7 100644 --- a/src/screen.h +++ b/src/screen.h @@ -32,6 +32,7 @@ in this Software without prior written authorization from The Open Group. * 11-3-88 Dave Payne, Apple Computer File created * ***********************************************************************/ +/* $XFree86: xc/programs/twm/screen.h,v 1.5 2001/12/14 20:01:10 dawes Exp $ */ #ifndef _SCREEN_ #define _SCREEN_ @@ -83,7 +84,7 @@ typedef struct ScreenInfo Pixmap UnknownPm; /* the unknown icon pixmap */ Pixmap siconifyPm; /* the icon manager iconify pixmap */ Pixmap pullPm; /* pull right menu icon */ - int pullW, pullH; /* size of pull right menu icon */ + unsigned int pullW, pullH; /* size of pull right menu icon */ Pixmap hilitePm; /* focus highlight window background */ int hilite_pm_width, hilite_pm_height; /* cache the size */ -- cgit v1.2.3