fdo-mirrors/xorg-libx11
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libx11.git synced 2026-05-07 07:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Recognize XSUNBUFFERSIZE alias for XLIBBUFFERSIZE on Solaris

Browse source 
Also fix indenting of the XLIBBUFFERSIZE code to match surrounding code

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
This commit is contained in:
Alan Coopersmith 2009-10-14 13:23:30 -07:00
parent 34ddfca7b7
commit a2c8e3e34b
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/OpenDis.c
View file

@ -273,21 +273,28 @@ XOpenDisplay (
#ifndef XLIBMINBUFSIZE
#define XLIBMINBUFSIZE BUFSIZE /* old default buffer size */
#endif
if ((xlib_buffer_size = getenv("XLIBBUFFERSIZE")) == NULL)
conn_buf_size = XLIBDEFAULTBUFSIZE;
else
conn_buf_size = 1024 * strtol(xlib_buffer_size, NULL, 10);
if (conn_buf_size < XLIBMINBUFSIZE)
conn_buf_size = XLIBMINBUFSIZE;
xlib_buffer_size = getenv("XLIBBUFFERSIZE");
if ((dpy->bufptr = dpy->buffer = Xcalloc(1, conn_buf_size)) == NULL) {
OutOfMemory (dpy, setup);
return(NULL);
}
dpy->bufmax = dpy->buffer + conn_buf_size;
#ifdef __sun /* Backwards compatibility for old Solaris libX11 name */
if (xlib_buffer_size == NULL)
xlib_buffer_size = getenv("XSUNBUFFERSIZE");
#endif
if (xlib_buffer_size == NULL)
conn_buf_size = XLIBDEFAULTBUFSIZE;
else
conn_buf_size = 1024 * strtol(xlib_buffer_size, NULL, 10);
if (conn_buf_size < XLIBMINBUFSIZE)
conn_buf_size = XLIBMINBUFSIZE;
if ((dpy->bufptr = dpy->buffer = Xcalloc(1, conn_buf_size)) == NULL) {
OutOfMemory (dpy, setup);
return(NULL);
}
dpy->bufmax = dpy->buffer + conn_buf_size;
#if USE_XCB
dpy->xcb->real_bufmax = dpy->bufmax;
dpy->bufmax = dpy->buffer;
dpy->xcb->real_bufmax = dpy->bufmax;
dpy->bufmax = dpy->buffer;
#endif
/* Set up the input event queue and input event queue parameters. */