diff options
| author | Julien Cristau <jcristau@debian.org> | 2007-08-09 11:25:42 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2007-08-09 11:25:42 +0200 |
| commit | 43e6260ed061f915b2c631643c2a303015f2f044 (patch) | |
| tree | b34d680b6850bafeabc57a688413cb8bbee34c32 /src/glut | |
| parent | c6728df4a3d8d5bc04626e57f6c0ec40d60ab1c7 (diff) | |
| parent | ae16a51e95f8d0e4e354f28885c13a3bbe66b270 (diff) | |
Merge tag 'mesa_7_0_1' into debian-experimental
Diffstat (limited to 'src/glut')
| -rw-r--r-- | src/glut/glx/glut_dstr.c | 1 | ||||
| -rw-r--r-- | src/glut/glx/glut_event.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/glut/glx/glut_dstr.c b/src/glut/glx/glut_dstr.c index ec9386f3e50..2513af45394 100644 --- a/src/glut/glx/glut_dstr.c +++ b/src/glut/glx/glut_dstr.c @@ -291,6 +291,7 @@ loadVisuals(int *nitems_return) fbmodes = (FrameBufferMode *) malloc(n * sizeof(FrameBufferMode)); if (fbmodes == NULL) { *nitems_return = -1; + free(vlist); return NULL; } for (i = 0; i < n; i++) { diff --git a/src/glut/glx/glut_event.c b/src/glut/glx/glut_event.c index 4e67da674ed..0a96e8cf71d 100644 --- a/src/glut/glx/glut_event.c +++ b/src/glut/glx/glut_event.c @@ -24,7 +24,7 @@ # ifdef __sgi # include <bstring.h> /* prototype for bzero used by FD_ZERO */ # endif -# if (defined(SVR4) || defined(CRAY) || defined(AIXV3)) && !defined(FD_SETSIZE) +# if (defined(__FreeBSD__) || defined(SVR4) || defined(CRAY) || defined(AIXV3)) && !defined(FD_SETSIZE) # include <sys/select.h> /* select system call interface */ # ifdef luna # include <sysent.h> |