diff options
Diffstat (limited to 'xorg-server/dix/registry.c')
| -rw-r--r-- | xorg-server/dix/registry.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/xorg-server/dix/registry.c b/xorg-server/dix/registry.c index 5bad0fdd4..18344f417 100644 --- a/xorg-server/dix/registry.c +++ b/xorg-server/dix/registry.c @@ -25,6 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <stdlib.h> #include <string.h> +#include <unistd.h> #include <X11/X.h> #include <X11/Xproto.h> #include "resource.h" @@ -207,7 +208,7 @@ RegisterResourceName(RESTYPE resource, const char *name) resource &= TypeMask; while (resource >= nresource) { - if (!double_size(&resources, nresource, sizeof(char *))) + if (!double_size((void*)&resources, nresource, sizeof(char *))) return; nresource = nresource ? nresource * 2 : BASE_SIZE; } @@ -286,7 +287,7 @@ LookupResourceName(RESTYPE resource) void dixResetRegistry(void) { - ExtensionEntry extEntry = { .name = CORE }; + ExtensionEntry extEntry; /* Free all memory */ while (nmajor--) { @@ -305,7 +306,7 @@ dixResetRegistry(void) free(errors[nerror]); free(errors); - free(resources); + free((void*)resources); requests = NULL; nminor = NULL; @@ -336,6 +337,8 @@ dixResetRegistry(void) RegisterResourceName(RT_PASSIVEGRAB, "PASSIVE GRAB"); /* Add the core protocol */ + memset(&extEntry, 0, sizeof(extEntry)); + extEntry.name = CORE; RegisterExtensionNames(&extEntry); } |