Move strcasecmp(), strcasencmp() and strcasestr() prototypes to os.h
And make sure os.h is included in files that use it.
This commit is contained in:
parent
02efa78ce2
commit
2e2ce817ce
|
@ -88,6 +88,8 @@
|
|||
#include "dgaproc.h"
|
||||
#endif
|
||||
|
||||
#include "os.h"
|
||||
|
||||
EventListPtr xf86Events = NULL;
|
||||
|
||||
/**
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
#define XKBSRV_NEED_FILE_FUNCS
|
||||
#include <xkbsrv.h>
|
||||
|
||||
#include "os.h"
|
||||
#include "xf86.h"
|
||||
|
||||
int
|
||||
|
|
|
@ -596,22 +596,6 @@ typedef struct {
|
|||
int count;
|
||||
} DeviceEventInfoRec;
|
||||
|
||||
/* strcasecmp.c */
|
||||
#if NEED_STRCASECMP
|
||||
#define strcasecmp xstrcasecmp
|
||||
extern int xstrcasecmp(const char *s1, const char *s2);
|
||||
#endif
|
||||
|
||||
#if NEED_STRNCASECMP
|
||||
#define strncasecmp xstrncasecmp
|
||||
extern int xstrncasecmp(const char *s1, const char *s2, size_t n);
|
||||
#endif
|
||||
|
||||
#if NEED_STRCASESTR
|
||||
#define strcasestr xstrcasestr
|
||||
extern char *xstrcasestr(const char *s, const char *find);
|
||||
#endif
|
||||
|
||||
extern int XItoCoreType(int xi_type);
|
||||
extern Bool DevHasCursor(DeviceIntPtr pDev);
|
||||
extern Bool IsPointerDevice( DeviceIntPtr dev);
|
||||
|
|
16
include/os.h
16
include/os.h
|
@ -450,6 +450,22 @@ extern void AbortDDX(void);
|
|||
extern void ddxGiveUp(void);
|
||||
extern int TimeSinceLastInputEvent(void);
|
||||
|
||||
/* strcasecmp.c */
|
||||
#if NEED_STRCASECMP
|
||||
#define strcasecmp xstrcasecmp
|
||||
extern int xstrcasecmp(const char *s1, const char *s2);
|
||||
#endif
|
||||
|
||||
#if NEED_STRNCASECMP
|
||||
#define strncasecmp xstrncasecmp
|
||||
extern int xstrncasecmp(const char *s1, const char *s2, size_t n);
|
||||
#endif
|
||||
|
||||
#if NEED_STRCASESTR
|
||||
#define strcasestr xstrcasestr
|
||||
extern char *xstrcasestr(const char *s, const char *find);
|
||||
#endif
|
||||
|
||||
/* Logging. */
|
||||
typedef enum _LogParameter {
|
||||
XLOG_FLUSH,
|
||||
|
|
|
@ -46,6 +46,7 @@
|
|||
#include "misc.h"
|
||||
#include "inputstr.h"
|
||||
#include "dix.h"
|
||||
#include "os.h"
|
||||
#include "xkbstr.h"
|
||||
#define XKBSRV_NEED_FILE_FUNCS
|
||||
#include <xkbsrv.h>
|
||||
|
|
Loading…
Reference in New Issue
Block a user