diff options
| author | Ian Elliott <ian@LunarG.com> | 2015-02-27 11:10:59 -0700 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-03-02 17:21:11 -0700 |
| commit | e7a46e6eb3a32a28f4e74a8b0e5cbeeae73acc1b (patch) | |
| tree | c72d19e5b8dbcbf613399c59736e94af7d6c9ead | |
| parent | 61a8ce5773bd08c551f90c65ad817566fc0cf861 (diff) | |
| download | usermoji-e7a46e6eb3a32a28f4e74a8b0e5cbeeae73acc1b.tar.xz | |
Win/glave: Remove new compiler warnings on Windows.
Compiling the glvtrace_xgl64.dll library on Windows (see prior commit) resulted
in new warnings, some of which seemed serious (e.g. using "sizeof(void)", which
is 1 on Linux, with GCC, but is 0 on Windows).
| -rwxr-xr-x | glave-generate.py | 11 | ||||
| -rw-r--r-- | include/XCB/randr.h | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/glave-generate.py b/glave-generate.py index 0bc21ab1..a4691de2 100755 --- a/glave-generate.py +++ b/glave-generate.py @@ -297,7 +297,7 @@ class Subcommand(object): init_tracer.append(' FINISH_TRACE_PACKET();\n}\n') init_tracer.append('static GLV_CRITICAL_SECTION g_memInfoLock;') - init_tracer.append('void InitTracer()\n{') + init_tracer.append('void InitTracer(void)\n{') init_tracer.append(' char *ipAddr = glv_get_global_var("GLVLIB_TRACE_IPADDR");') init_tracer.append(' if (ipAddr == NULL)') init_tracer.append(' ipAddr = "127.0.0.1";') @@ -693,7 +693,10 @@ class Subcommand(object): if proto.name in thread_once_funcs: func_body.append(' glv_platform_thread_once(&gInitOnce, InitTracer);') func_body.append(' SEND_ENTRYPOINT_ID(xgl%s);' % proto.name) - func_body.append(' CREATE_TRACE_PACKET(xgl%s, %s);' % (proto.name, packet_size)) + if 'DbgRegisterMsgCallback' in proto.name: + func_body.append(' CREATE_TRACE_PACKET(xgl%s, sizeof(char));' % proto.name) + else: + func_body.append(' CREATE_TRACE_PACKET(xgl%s, %s);' % (proto.name, packet_size)) func_body.append(' %sreal_xgl%s;' % (return_txt, proto.c_call())) func_body.append(' pPacket = interpret_body_as_xgl%s(pHeader);' % proto.name) func_body.append(packet_update_txt.strip('\n')) @@ -702,6 +705,8 @@ class Subcommand(object): func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->%s), ((%s != NULL) ? strlen(%s) + 1 : 0), %s);' % (proto.params[idx].name, proto.params[idx].name, proto.params[idx].name, proto.params[idx].name)) elif 'Size' in proto.params[idx-1].name: func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->%s), %s, %s);' % (proto.params[idx].name, proto.params[idx-1].name, proto.params[idx].name)) + elif 'DbgRegisterMsgCallback' in proto.name: + func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->%s), sizeof(%s), %s);' % (proto.params[idx].name, 'char', proto.params[idx].name)) else: func_body.append(' glv_add_buffer_to_trace_packet(pHeader, (void**)&(pPacket->%s), sizeof(%s), %s);' % (proto.params[idx].name, proto.params[idx].ty.strip('*').replace('const ', ''), proto.params[idx].name)) if 'WsiX11AssociateConnection' in proto.name: @@ -3462,7 +3467,7 @@ class GlaveTraceHeader(Subcommand): header_txt.append('#include "glvtrace_xgl_packet_id.h"\n') header_txt.append('void AttachHooks();') header_txt.append('void DetachHooks();') - header_txt.append('void InitTracer();\n') + header_txt.append('void InitTracer(void);\n') return "\n".join(header_txt) def generate_body(self): diff --git a/include/XCB/randr.h b/include/XCB/randr.h index b4c101d9..175b9731 100644 --- a/include/XCB/randr.h +++ b/include/XCB/randr.h @@ -2,6 +2,6 @@ #define __RANDR_H typedef void * xcb_randr_provider_t; -typedef void * xcb_randr_crtc_t; +typedef uint32_t xcb_randr_crtc_t; #endif // __RANDR_H |