diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2019-08-01 23:18:03 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-29 17:10:05 +0200 |
commit | b1850beb9f58f32cb13f585b55a44a4467f2093a (patch) | |
tree | 6978f1e17389167ad21fbc2a7405288979afa088 /nx-X11/programs/Xserver/hw/nxagent/Screen.c | |
parent | 7d2a222f2c6b87c7277b50ed89e522b39a495975 (diff) | |
download | nx-libs-b1850beb9f58f32cb13f585b55a44a4467f2093a.tar.gz nx-libs-b1850beb9f58f32cb13f585b55a44a4467f2093a.tar.bz2 nx-libs-b1850beb9f58f32cb13f585b55a44a4467f2093a.zip |
nxagent: avoid nested externs
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Screen.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index b6b3fcd58..c8449675a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -141,6 +141,10 @@ extern Bool useXpmIcon; extern Bool nxagentReportWindowIds; +#ifdef NXAGENT_TIMESTAMP +extern unsigned long startTime; +#endif + Window nxagentDefaultWindows[MAXSCREENS]; Window nxagentInputWindows[MAXSCREENS]; Window nxagentScreenSaverWindows[MAXSCREENS]; @@ -216,6 +220,8 @@ RegionRec nxagentShadowUpdateRegion; extern Bool nxagentAutoDPI; +extern char *nxagentKeyboard; + /* * From randr/randr.c. This was originally static * but we need it here. @@ -1197,14 +1203,8 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, } #ifdef NXAGENT_TIMESTAMP - - { - extern unsigned long startTime; - - fprintf(stderr, "Screen: going to open screen, time is [%d] milliseconds.\n", - GetTimeInMillis() - startTime); - } - + fprintf(stderr, "Screen: going to open screen, time is [%d] milliseconds.\n", + GetTimeInMillis() - startTime); #endif /* @@ -2131,13 +2131,8 @@ N/A XSelectInput(nxagentDisplay, DefaultRootWindow(nxagentDisplay), StructureNotifyMask); #ifdef NXAGENT_TIMESTAMP - - { - extern unsigned long startTime; - - fprintf(stderr, "Screen: open screen finished, time is [%d] milliseconds.\n", - GetTimeInMillis() - startTime); - } + fprintf(stderr, "Screen: open screen finished, time is [%d] milliseconds.\n", + GetTimeInMillis() - startTime); #endif @@ -2585,7 +2580,6 @@ void nxagentShadowSetWindowOptions(void) int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin) { char *layout = NULL; - extern char *nxagentKeyboard; XlibGC gc; XGCValues value; |