diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/dixstruct.h | 4 | ||||
| -rw-r--r-- | include/input.h | 4 | ||||
| -rw-r--r-- | include/ptrveloc.h | 7 | ||||
| -rw-r--r-- | include/xkbsrv.h | 8 | ||||
| -rw-r--r-- | include/xorg-config.h.in | 3 |
5 files changed, 10 insertions, 16 deletions
diff --git a/include/dixstruct.h b/include/dixstruct.h index 7335fad95..696b793ff 100644 --- a/include/dixstruct.h +++ b/include/dixstruct.h @@ -37,10 +37,6 @@ SOFTWARE. * translation from client ids to server addresses. */ -#ifdef DEBUG -#define MAX_REQUEST_LOG 100 -#endif - extern _X_EXPORT CallbackListPtr ClientStateCallback; typedef struct { diff --git a/include/input.h b/include/input.h index 437b392ff..b3d56b31c 100644 --- a/include/input.h +++ b/include/input.h @@ -515,4 +515,8 @@ extern _X_EXPORT void DDXRingBell( int pitch, int duration); +/* Set to TRUE by default - os/utils.c sets it to FALSE on user request, + xfixes/cursor.c uses it to determine if the cursor is enabled */ +extern Bool EnableCursor; + #endif /* INPUT_H */ diff --git a/include/ptrveloc.h b/include/ptrveloc.h index 6ef8c754e..83d188c54 100644 --- a/include/ptrveloc.h +++ b/include/ptrveloc.h @@ -27,9 +27,9 @@ #include <input.h> /* DeviceIntPtr */ -/* constants for acceleration profiles; - * see */ +/* constants for acceleration profiles */ +#define AccelProfileNone -1 #define AccelProfileClassic 0 #define AccelProfileDeviceSpecific 1 #define AccelProfilePolynomial 2 @@ -37,8 +37,7 @@ #define AccelProfileSimple 4 #define AccelProfilePower 5 #define AccelProfileLinear 6 -#define AccelProfileReserved 7 -#define AccelProfileLAST AccelProfileReserved +#define AccelProfileLAST AccelProfileLinear /* fwd */ struct _DeviceVelocityRec; diff --git a/include/xkbsrv.h b/include/xkbsrv.h index 64584ff96..48891fd99 100644 --- a/include/xkbsrv.h +++ b/include/xkbsrv.h @@ -301,15 +301,11 @@ extern _X_EXPORT pointer XkbLastRepeatEvent; extern _X_EXPORT CARD32 xkbDebugFlags; -#define _XkbAlloc(s) xalloc((s)) -#define _XkbCalloc(n,s) Xcalloc((n)*(s)) -#define _XkbRealloc(o,s) Xrealloc((o),(s)) #define _XkbTypedAlloc(t) ((t *)xalloc(sizeof(t))) #define _XkbTypedCalloc(n,t) ((t *)Xcalloc((n)*sizeof(t))) #define _XkbTypedRealloc(o,n,t) \ ((o)?(t *)Xrealloc((o),(n)*sizeof(t)):_XkbTypedCalloc(n,t)) #define _XkbClearElems(a,f,l,t) bzero(&(a)[f],((l)-(f)+1)*sizeof(t)) -#define _XkbFree(p) Xfree(p) #define _XkbLibError(c,l,d) /* Epoch fail */ #define _XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff))) @@ -333,8 +329,6 @@ extern _X_EXPORT int DeviceButtonPress,DeviceButtonRelease; #define False FALSE #endif -_XFUNCPROTOBEGIN - extern _X_EXPORT void XkbUseMsg( void ); @@ -1003,8 +997,6 @@ extern _X_EXPORT XkbDescPtr XkbCompileKeymap( XkbRMLVOSet * /* rmlvo */ ); -_XFUNCPROTOEND - #define XkbAtomGetString(s) NameForAtom(s) #endif /* _XKBSRV_H_ */ diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in index f9b77d03d..ebeb44a37 100644 --- a/include/xorg-config.h.in +++ b/include/xorg-config.h.in @@ -54,6 +54,9 @@ /* Solaris 8 or later? */ #undef __SOL8__ +/* Define to 1 if you have the <stropts.h> header file. */ +#undef HAVE_STROPTS_H + /* Define to 1 if you have the <sys/kd.h> header file. */ #undef HAVE_SYS_KD_H |