fbdevhw: Fix inconsistent #if DEBUG usage
fbdevhw is the only file in X's source that actually uses #if DEBUG to check for debugging instead of #ifdef DEBUG. This is contrary to everything else that checks the DEBUG macro in the source, so let's make it consistent and in turn, make our meson files a little simpler. Signed-off-by: Lyude Paul <lyude@redhat.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
parent
c66d65a645
commit
01470ce0a9
|
@ -120,7 +120,7 @@ fbdevHWGetFD(ScrnInfoPtr pScrn)
|
||||||
/* -------------------------------------------------------------------- */
|
/* -------------------------------------------------------------------- */
|
||||||
/* some helpers for printing debug informations */
|
/* some helpers for printing debug informations */
|
||||||
|
|
||||||
#if DEBUG
|
#ifdef DEBUG
|
||||||
static void
|
static void
|
||||||
print_fbdev_mode(const char *txt, struct fb_var_screeninfo *var)
|
print_fbdev_mode(const char *txt, struct fb_var_screeninfo *var)
|
||||||
{
|
{
|
||||||
|
@ -466,7 +466,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool check)
|
||||||
xfree2fbdev_fblayout(pScrn, &req_var);
|
xfree2fbdev_fblayout(pScrn, &req_var);
|
||||||
xfree2fbdev_timing(mode, &req_var);
|
xfree2fbdev_timing(mode, &req_var);
|
||||||
|
|
||||||
#if DEBUG
|
#ifdef DEBUG
|
||||||
print_xfree_mode("init", mode);
|
print_xfree_mode("init", mode);
|
||||||
print_fbdev_mode("init", &req_var);
|
print_fbdev_mode("init", &req_var);
|
||||||
#endif
|
#endif
|
||||||
|
@ -486,7 +486,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool check)
|
||||||
if (!check)
|
if (!check)
|
||||||
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
|
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
|
||||||
"FBIOPUT_VSCREENINFO succeeded but modified " "mode\n");
|
"FBIOPUT_VSCREENINFO succeeded but modified " "mode\n");
|
||||||
#if DEBUG
|
#ifdef DEBUG
|
||||||
print_fbdev_mode("returned", &set_var);
|
print_fbdev_mode("returned", &set_var);
|
||||||
#endif
|
#endif
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
Loading…
Reference in New Issue