diff options
| author | marha <marha@users.sourceforge.net> | 2010-10-19 21:03:53 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-10-19 21:03:53 +0000 |
| commit | be10ad8a9efe4131c14c2dde36adaf11e7b125aa (patch) | |
| tree | 0a0f9305b181d427c5581f7a072e69e52199bdbb /xorg-server/hw/xwin/winprefs.c | |
| parent | 2197318e5fc026ee57325ce953113d1963e7dc82 (diff) | |
| parent | 6ab3babba7b1b74528c2194a495fa1e2e67faa55 (diff) | |
| download | vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.tar.gz vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.tar.bz2 vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xwin/winprefs.c')
| -rw-r--r-- | xorg-server/hw/xwin/winprefs.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/xorg-server/hw/xwin/winprefs.c b/xorg-server/hw/xwin/winprefs.c index 4d34e41a1..f24074636 100644 --- a/xorg-server/hw/xwin/winprefs.c +++ b/xorg-server/hw/xwin/winprefs.c @@ -49,11 +49,6 @@ /* Where will the custom menu commands start counting from? */
#define STARTMENUID WM_USER
-/* External global variables */
-#ifdef XWIN_MULTIWINDOW
-extern DWORD g_dwCurrentThreadID;
-#endif
-
extern const char *winGetBaseDir(void);
extern const char *g_pszLogFile;
@@ -61,12 +56,6 @@ extern const char *g_pszLogFile; /* From winmultiwindowflex.l, the real parser */
extern void parse_file (FILE *fp);
-/* From winprefyacc.y, the pref structure loaded by the parser */
-extern WINPREFS pref;
-
-/* The global X default icon */
-extern HICON g_hIconX;
-extern HICON g_hSmallIconX;
/* Currently in use command ID, incremented each new menu item created */
static int g_cmdid = STARTMENUID;
|