diff options
author | marha <marha@users.sourceforge.net> | 2012-04-16 09:37:37 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-04-16 09:43:48 +0200 |
commit | 00eae6f01bf11ec6a90dfc68e607b6a1a250a118 (patch) | |
tree | b814d518076840b7433d02bc3b5957c1dd54de25 /xorg-server/hw/dmx/dmxstat.h | |
parent | a50d2ee664302147942dd5ed6428f9bab9d4e76a (diff) | |
parent | d6d3999ccb2cb72d55820770260172eccbbb68d7 (diff) | |
download | vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.gz vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.bz2 vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/securitysrv.h
xorg-server/glx/glxext.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_size_get.c
xorg-server/hw/xwin/winclip.c
xorg-server/hw/xwin/winfont.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winglobals.h
xorg-server/hw/xwin/winmonitors.h
xorg-server/include/closestr.h
xorg-server/include/pixmapstr.h
xorg-server/include/servermd.h
xorg-server/include/site.h
xorg-server/include/windowstr.h
xorg-server/include/xkbstr.h
Diffstat (limited to 'xorg-server/hw/dmx/dmxstat.h')
-rw-r--r-- | xorg-server/hw/dmx/dmxstat.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xorg-server/hw/dmx/dmxstat.h b/xorg-server/hw/dmx/dmxstat.h index 04c88d3c9..8c8d7bae5 100644 --- a/xorg-server/hw/dmx/dmxstat.h +++ b/xorg-server/hw/dmx/dmxstat.h @@ -43,13 +43,13 @@ #define DMX_STAT_BIN0 10000 /**< us for bin[0] */ #define DMX_STAT_BINMULT 100 /**< multiplier for next bin[] */ -extern int dmxStatInterval; /**< Only for dmxstat.c and dmxsync.c */ -extern void dmxStatActivate(const char *interval, const char *displays); +extern int dmxStatInterval; /**< Only for dmxstat.c and dmxsync.c */ +extern void dmxStatActivate(const char *interval, const char *displays); extern DMXStatInfo *dmxStatAlloc(void); -extern void dmxStatFree(DMXStatInfo *); -extern void dmxStatInit(void); -extern void dmxStatSync(DMXScreenInfo *dmxScreen, - struct timeval *stop, struct timeval *start, - unsigned long pending); +extern void dmxStatFree(DMXStatInfo *); +extern void dmxStatInit(void); +extern void dmxStatSync(DMXScreenInfo * dmxScreen, + struct timeval *stop, struct timeval *start, + unsigned long pending); #endif |