diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
| commit | 1678a69116d1c6ce900fe15f7813613bb28416dd (patch) | |
| tree | 9589536f6b4bd60b34f90cf5ed20240d40bbb38c /libXext/src/XShm.c | |
| parent | 9d911bc1246139019e555f443e934677a067bc0a (diff) | |
| parent | b2c925e360e2c366526de15b44603f855f94139c (diff) | |
| download | vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.gz vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.bz2 vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libfontenc/src/fontenc.c
Diffstat (limited to 'libXext/src/XShm.c')
| -rw-r--r-- | libXext/src/XShm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libXext/src/XShm.c b/libXext/src/XShm.c index d1f1a4d7f..e3f8fa09b 100644 --- a/libXext/src/XShm.c +++ b/libXext/src/XShm.c @@ -74,7 +74,7 @@ static /* const */ char *shm_error_list[] = { "BadShmSeg", /* BadShmSeg */ }; -static XEXT_GENERATE_FIND_DISPLAY (find_display, shm_info, shm_extension_name, +static XEXT_GENERATE_FIND_DISPLAY (find_display, shm_info, shm_extension_name, &shm_extension_hooks, ShmNumberEvents, NULL) static XEXT_GENERATE_CLOSE_DISPLAY (close_display, shm_info) |