diff options
| author | Brian Paul <brianp@vmware.com> | 2009-05-05 10:13:13 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-05-05 10:13:13 -0600 |
| commit | b3fc832ac79d89486559c018267ae846a7eff832 (patch) | |
| tree | 77064177c54a3da8e1219b067cb20e3873e613bb /src/glx/x11 | |
| parent | 95b7771ea705b71bbd8185cd8e39b546e18e09a9 (diff) | |
| parent | 79ada8c6331a801a0475f38a540670b14e168f19 (diff) | |
Merge branch 'mesa_7_5_branch'
Diffstat (limited to 'src/glx/x11')
| -rw-r--r-- | src/glx/x11/dri_glx.c | 2 | ||||
| -rw-r--r-- | src/glx/x11/drisw_glx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c index 87d62ad846..3ce410d9be 100644 --- a/src/glx/x11/dri_glx.c +++ b/src/glx/x11/dri_glx.c @@ -614,7 +614,7 @@ static __GLXDRIscreen *driCreateScreen(__GLXscreenConfigs *psc, int screen, char *driverName; int i; - psp = Xmalloc(sizeof *psp); + psp = Xcalloc(1, sizeof *psp); if (psp == NULL) return NULL; diff --git a/src/glx/x11/drisw_glx.c b/src/glx/x11/drisw_glx.c index 35bbd9151c..5e3d763cff 100644 --- a/src/glx/x11/drisw_glx.c +++ b/src/glx/x11/drisw_glx.c @@ -359,7 +359,7 @@ driCreateScreen(__GLXscreenConfigs * psc, int screen, const char *driverName = "swrast"; int i; - psp = Xmalloc(sizeof *psp); + psp = Xcalloc(1, sizeof *psp); if (psp == NULL) return NULL; |