Remove this file and all references to the binary expiry code.
Remove old obsolete include/extensions/damage.h. Include srvrv_ctrl(xfree86) in macintosh US XKB symbol file so VT switching works again on mac (#1872). Remove out of place #define's of printf to xf86printf. This definition should only be in xfree86/os-support/xf86_libc.h
This commit is contained in:
parent
9a26d6f39e
commit
da3df7522d
|
@ -364,11 +364,6 @@ void xf86AddModuleInfo(ModuleInfoPtr info, pointer module);
|
|||
void xf86DeleteModuleInfo(int idx);
|
||||
#endif
|
||||
|
||||
#ifdef printf_defined
|
||||
#define printf xf86printf
|
||||
#undef printf_defined
|
||||
#endif
|
||||
|
||||
/* xf86Debug.c */
|
||||
#ifdef BUILDDEBUG
|
||||
void xf86Break1(void);
|
||||
|
|
|
@ -106,11 +106,6 @@ static void xf86PrintBanner(void);
|
|||
static void xf86PrintMarkers(void);
|
||||
static void xf86RunVtInit(void);
|
||||
|
||||
#ifdef DO_CHECK_BETA
|
||||
static int extraDays = 0;
|
||||
static char *expKey = NULL;
|
||||
#endif
|
||||
|
||||
#ifdef __UNIXOS2__
|
||||
extern void os2ServerVideoAccess();
|
||||
#endif
|
||||
|
@ -307,10 +302,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
|
|||
else
|
||||
xf86ServerName = argv[0];
|
||||
|
||||
#ifdef DO_CHECK_BETA
|
||||
xf86CheckBeta(extraDays, expKey);
|
||||
#endif
|
||||
|
||||
xf86PrintBanner();
|
||||
xf86PrintMarkers();
|
||||
if (xf86LogFile) {
|
||||
|
@ -1437,14 +1428,6 @@ ddxProcessArgument(int argc, char **argv, int i)
|
|||
#endif
|
||||
return 1;
|
||||
}
|
||||
#ifdef DO_CHECK_BETA
|
||||
if (!strcmp(argv[i],"-extendExpiry"))
|
||||
{
|
||||
extraDays = atoi(argv[i + 1]);
|
||||
expKey = argv[i + 2];
|
||||
return 3;
|
||||
}
|
||||
#endif
|
||||
if (!strcmp(argv[i],"-verbose"))
|
||||
{
|
||||
if (++i < argc && argv[i])
|
||||
|
|
|
@ -131,9 +131,6 @@ extern RootWinPropPtr *xf86RegisteredPropertiesTable;
|
|||
/* Function Prototypes */
|
||||
#ifndef _NO_XF86_PROTOTYPES
|
||||
|
||||
/* xf86Beta.c */
|
||||
extern void xf86CheckBeta(int extraDays, char *key);
|
||||
|
||||
/* xf86Bus.c */
|
||||
|
||||
void xf86BusProbe(void);
|
||||
|
|
|
@ -544,9 +544,4 @@ extern int snprintf(char *str, size_t size, const char *format, ...)
|
|||
extern int vsnprintf(char *str, size_t size, const char *format, va_list ap);
|
||||
#endif
|
||||
|
||||
#ifdef printf_defined
|
||||
#define printf xf86printf
|
||||
#undef printf_defined
|
||||
#endif
|
||||
|
||||
#endif /* OS_H */
|
||||
|
|
Loading…
Reference in New Issue
Block a user