Skip to content

Commit 2dacd81

Browse files
committed
[PR #1358] dix: unexport defaultFontPath
PR: #1358
1 parent 1c706ef commit 2dacd81

File tree

5 files changed

+7
-1
lines changed

5 files changed

+7
-1
lines changed

dix/dix_priv.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ extern HWEventQueuePtr checkForInput[2];
6060
/* -retro mode */
6161
extern Bool party_like_its_1989;
6262

63+
extern const char *defaultFontPath;
64+
6365
/*
6466
* @brief callback right after one screen's root window has been initialized
6567
*

hw/xfree86/common/xf86Config.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#include <sys/types.h>
5151
#include <grp.h>
5252

53+
#include "dix/dix_priv.h"
5354
#include "dix/resource_priv.h"
5455
#include "dix/screensaver_priv.h"
5556
#include "include/extinit.h"

hw/xfree86/common/xf86Configure.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
#include <errno.h>
3131

32+
#include "dix/dix_priv.h"
3233
#include "os/ddx_priv.h"
3334
#include "os/osdep.h"
3435

hw/xwin/winconfig.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
#ifdef HAVE_XWIN_CONFIG_H
3232
#include <xwin-config.h>
3333
#endif
34+
35+
#include "dix/dix_priv.h"
36+
3437
#include "win.h"
3538
#include "winconfig.h"
3639
#include "winmsg.h"

include/globals.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
/* Global X server variables that are visible to mi, dix, os, and ddx */
1616

17-
extern _X_EXPORT const char *defaultFontPath;
1817
extern _X_EXPORT int monitorResolution;
1918
extern _X_EXPORT int defaultColorVisualClass;
2019

0 commit comments

Comments
 (0)