diff options
author | marha <marha@users.sourceforge.net> | 2012-10-08 09:06:44 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-10-08 09:06:44 +0200 |
commit | 9b15e1cfe4c6ca9862c2865c4adbc21a758e9734 (patch) | |
tree | 13452621f70604f08fd91b1bd46ed6341dbc2ea7 /pixman/test/utils.h | |
parent | bd13c464f728719fceb8a4918b52727ec125ea6e (diff) | |
parent | de8397bc3d010bba24ec0c4d2e6249a769a86fc7 (diff) | |
download | vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.tar.gz vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.tar.bz2 vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012
Conflicts:
xorg-server/Xext/xf86bigfont.c
xorg-server/dix/dispatch.c
xorg-server/include/dixstruct.h
xorg-server/os/connection.c
Diffstat (limited to 'pixman/test/utils.h')
-rw-r--r-- | pixman/test/utils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pixman/test/utils.h b/pixman/test/utils.h index faf427f0a..f7ea34c5f 100644 --- a/pixman/test/utils.h +++ b/pixman/test/utils.h @@ -110,7 +110,7 @@ void fail_after (int seconds, const char *msg); /* If possible, enable traps for floating point exceptions */ -void enable_fp_exceptions(void); +void enable_divbyzero_exceptions(void); /* Converts a8r8g8b8 pixels to pixels that * - are not premultiplied, |