diff options
author | marha <marha@users.sourceforge.net> | 2012-09-06 08:49:13 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-09-06 08:49:13 +0200 |
commit | ccc8a492607df715b08d27c6bb3b9d13b1ff48a2 (patch) | |
tree | 4311d252acd49786ceed60cb55343af0a9294a2f /mesalib/src/mapi/glapi/gen/glX_proto_send.py | |
parent | a4d007b9b60f2fc7c8de46533e2f47ecb24f3c9c (diff) | |
parent | aa10a08696cae93799fcddae3f0245ceee905e01 (diff) | |
download | vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.tar.gz vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.tar.bz2 vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/glX_proto_send.py')
-rw-r--r-- | mesalib/src/mapi/glapi/gen/glX_proto_send.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_send.py b/mesalib/src/mapi/glapi/gen/glX_proto_send.py index c53359240..d42f661ea 100644 --- a/mesalib/src/mapi/glapi/gen/glX_proto_send.py +++ b/mesalib/src/mapi/glapi/gen/glX_proto_send.py @@ -239,7 +239,7 @@ __glXReadPixelReply( Display *dpy, struct glx_context * gc, unsigned max_dim, size = reply.length * 4; if (size != 0) { - void * buf = Xmalloc( size ); + void * buf = malloc( size ); if ( buf == NULL ) { _XEatData(dpy, size); @@ -255,7 +255,7 @@ __glXReadPixelReply( Display *dpy, struct glx_context * gc, unsigned max_dim, __glEmptyImage(gc, 3, width, height, depth, format, type, buf, dest); - Xfree(buf); + free(buf); } } } @@ -970,7 +970,7 @@ struct _glapi_table * __glXNewIndirectAPI( void ) int o; entries = _glapi_get_dispatch_table_size(); - table = (_glapi_proc *) Xmalloc(entries * sizeof(_glapi_proc)); + table = malloc(entries * sizeof(_glapi_proc)); /* first, set all entries to point to no-op functions */ for (i = 0; i < entries; i++) { |