Previous 199869 Revisions Next

r34745 Friday 30th January, 2015 at 19:36:06 UTC by Peter Ferrie
fix compile on MSVC 2012 (nw)
[3rdparty/sqlite3]sqlite3.h
[src/emu/cpu]drcbex64.h drcbex86.h uml.h
[src/emu/ui]inputmap.c mainmenu.c
[src/lib/util]bitmap.c
[src/osd/windows]winprefix.h

trunk/3rdparty/sqlite3/sqlite3.h
r243256r243257
256256typedef sqlite_int64 sqlite3_int64;
257257typedef sqlite_uint64 sqlite3_uint64;
258258
259/* pointer-sized values */
260#ifdef PTR64
261typedef sqlite3_uint64                      FPTR;
262#else
263typedef unsigned int                        FPTR;
264#endif
265
259266/*
260267** If compiling for a processor that lacks floating point support,
261268** substitute integer for floating-point.
r243256r243257
43824389*/
43834390typedef void (*sqlite3_destructor_type)(void*);
43844391#define SQLITE_STATIC      ((sqlite3_destructor_type)0)
4385#define SQLITE_TRANSIENT   ((sqlite3_destructor_type)-1)
4392#define SQLITE_TRANSIENT   ((sqlite3_destructor_type)(FPTR)-1)
43864393
43874394/*
43884395** CAPI3REF: Setting The Result Of An SQL Function
trunk/src/emu/cpu/drcbex64.h
r243256r243257
7373      static inline be_parameter make_ireg(int regnum) { assert(regnum >= 0 && regnum < x64emit::REG_MAX); return be_parameter(PTYPE_INT_REGISTER, regnum); }
7474      static inline be_parameter make_freg(int regnum) { assert(regnum >= 0 && regnum < x64emit::REG_MAX); return be_parameter(PTYPE_FLOAT_REGISTER, regnum); }
7575      static inline be_parameter make_vreg(int regnum) { assert(regnum >= 0 && regnum < x64emit::REG_MAX); return be_parameter(PTYPE_VECTOR_REGISTER, regnum); }
76      static inline be_parameter make_memory(void *base) { return be_parameter(PTYPE_MEMORY, reinterpret_cast<be_parameter_value>(base)); }
77      static inline be_parameter make_memory(const void *base) { return be_parameter(PTYPE_MEMORY, reinterpret_cast<be_parameter_value>(const_cast<void *>(base))); }
76      static inline be_parameter make_memory(void *base) { return be_parameter(PTYPE_MEMORY, static_cast<be_parameter_value>(reinterpret_cast<FPTR>(base))); }
77      static inline be_parameter make_memory(const void *base) { return be_parameter(PTYPE_MEMORY, static_cast<be_parameter_value>(reinterpret_cast<FPTR>(const_cast<void *>(base)))); }
7878
7979      // operators
8080      bool operator==(const be_parameter &rhs) const { return (m_type == rhs.m_type && m_value == rhs.m_value); }
trunk/src/emu/cpu/drcbex86.h
r243256r243257
7373      static inline be_parameter make_ireg(int regnum) { assert(regnum >= 0 && regnum < x86emit::REG_MAX); return be_parameter(PTYPE_INT_REGISTER, regnum); }
7474      static inline be_parameter make_freg(int regnum) { assert(regnum >= 0 && regnum < x86emit::REG_MAX); return be_parameter(PTYPE_FLOAT_REGISTER, regnum); }
7575      static inline be_parameter make_vreg(int regnum) { assert(regnum >= 0 && regnum < x86emit::REG_MAX); return be_parameter(PTYPE_VECTOR_REGISTER, regnum); }
76      static inline be_parameter make_memory(void *base) { return be_parameter(PTYPE_MEMORY, reinterpret_cast<be_parameter_value>(base)); }
77      static inline be_parameter make_memory(const void *base) { return be_parameter(PTYPE_MEMORY, reinterpret_cast<be_parameter_value>(const_cast<void *>(base))); }
76      static inline be_parameter make_memory(void *base) { return be_parameter(PTYPE_MEMORY, static_cast<be_parameter_value>(reinterpret_cast<FPTR>(base))); }
77      static inline be_parameter make_memory(const void *base) { return be_parameter(PTYPE_MEMORY, static_cast<be_parameter_value>(reinterpret_cast<FPTR>(const_cast<void *>(base)))); }
7878
7979      // operators
8080      bool operator==(const be_parameter &rhs) const { return (m_type == rhs.m_type && m_value == rhs.m_value); }
trunk/src/emu/cpu/uml.h
r243256r243257
305305      parameter(UINT64 val) : m_type(PTYPE_IMMEDIATE), m_value(val) { }
306306      parameter(operand_size size, memory_scale scale) : m_type(PTYPE_SIZE_SCALE), m_value((scale << 4) | size) { assert(size >= SIZE_BYTE && size <= SIZE_DQWORD); assert(scale >= SCALE_x1 && scale <= SCALE_x8); }
307307      parameter(operand_size size, memory_space space) : m_type(PTYPE_SIZE_SPACE), m_value((space << 4) | size) { assert(size >= SIZE_BYTE && size <= SIZE_DQWORD); assert(space >= SPACE_PROGRAM && space <= SPACE_IO); }
308      parameter(code_handle &handle) : m_type(PTYPE_CODE_HANDLE), m_value(reinterpret_cast<parameter_value>(&handle)) { }
308      parameter(code_handle &handle) : m_type(PTYPE_CODE_HANDLE), m_value(static_cast<parameter_value>(reinterpret_cast<FPTR>(&handle))) { }
309309      parameter(code_label &label) : m_type(PTYPE_CODE_LABEL), m_value(label) { }
310310
311311      // creators for types that don't safely default
r243256r243257
313313      static inline parameter make_freg(int regnum) { assert(regnum >= REG_F0 && regnum < REG_F_END); return parameter(PTYPE_FLOAT_REGISTER, regnum); }
314314      static inline parameter make_vreg(int regnum) { assert(regnum >= REG_V0 && regnum < REG_V_END); return parameter(PTYPE_VECTOR_REGISTER, regnum); }
315315      static inline parameter make_mapvar(int mvnum) { assert(mvnum >= MAPVAR_M0 && mvnum < MAPVAR_END); return parameter(PTYPE_MAPVAR, mvnum); }
316      static inline parameter make_memory(void *base) { return parameter(PTYPE_MEMORY, reinterpret_cast<parameter_value>(base)); }
317      static inline parameter make_memory(const void *base) { return parameter(PTYPE_MEMORY, reinterpret_cast<parameter_value>(const_cast<void *>(base))); }
316      static inline parameter make_memory(void *base) { return parameter(PTYPE_MEMORY, static_cast<parameter_value>(reinterpret_cast<FPTR>(base))); }
317      static inline parameter make_memory(const void *base) { return parameter(PTYPE_MEMORY, static_cast<parameter_value>(reinterpret_cast<FPTR>(const_cast<void *>(base)))); }
318318      static inline parameter make_size(operand_size size) { assert(size >= SIZE_BYTE && size <= SIZE_DQWORD); return parameter(PTYPE_SIZE, size); }
319      static inline parameter make_string(const char *string) { return parameter(PTYPE_STRING, reinterpret_cast<parameter_value>(const_cast<char *>(string))); }
320      static inline parameter make_cfunc(c_function func) { return parameter(PTYPE_C_FUNCTION, reinterpret_cast<parameter_value>(func)); }
319      static inline parameter make_string(const char *string) { return parameter(PTYPE_STRING, static_cast<parameter_value>(reinterpret_cast<FPTR>(const_cast<char *>(string)))); }
320      static inline parameter make_cfunc(c_function func) { return parameter(PTYPE_C_FUNCTION, static_cast<parameter_value>(reinterpret_cast<FPTR>(func))); }
321321      static inline parameter make_rounding(float_rounding_mode mode) { assert(mode >= ROUND_TRUNC && mode <= ROUND_DEFAULT); return parameter(PTYPE_ROUNDING, mode); }
322322
323323      // operators
trunk/src/emu/ui/inputmap.c
r243256r243257
7373   /* process the menu */
7474   const ui_menu_event *menu_event = process(0);
7575   if (menu_event != NULL && menu_event->iptkey == IPT_UI_SELECT)
76      ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_input_general(machine(), container, int((long long)(menu_event->itemref)-1))));
76      ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_input_general(machine(), container, int((long long)((FPTR)menu_event->itemref)-1))));
7777}
7878
7979
trunk/src/emu/ui/mainmenu.c
r243256r243257
151151   /* process the menu */
152152   const ui_menu_event *menu_event = process(0);
153153   if (menu_event != NULL && menu_event->iptkey == IPT_UI_SELECT) {
154      switch((long long)(menu_event->itemref)) {
154      switch((long long)((FPTR) menu_event->itemref)) {
155155      case INPUT_GROUPS:
156156         ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_input_groups(machine(), container)));
157157         break;
trunk/src/lib/util/bitmap.c
r243256r243257
4949inline void bitmap_t::compute_base(int xslop, int yslop)
5050{
5151   m_base = m_alloc + (m_rowpixels * yslop + xslop) * (m_bpp / 8);
52   UINT64 aligned_base = ((reinterpret_cast<UINT64>(m_base) + (BITMAP_OVERALL_ALIGN - 1)) / BITMAP_OVERALL_ALIGN) * BITMAP_OVERALL_ALIGN;
52   UINT64 aligned_base = ((static_cast<UINT64>(reinterpret_cast<FPTR>(m_base)) + (BITMAP_OVERALL_ALIGN - 1)) / BITMAP_OVERALL_ALIGN) * BITMAP_OVERALL_ALIGN;
5353   m_base = reinterpret_cast<void *>(aligned_base);
5454}
5555
trunk/src/osd/windows/winprefix.h
r243256r243257
3131#pragma warning (disable: 5025 5026 5027)
3232#define _CRT_STDIO_LEGACY_WIDE_SPECIFIERS
3333#endif
34#define strtoll _strtoi64
3435#endif
3536
3637#ifdef __GNUC__

https://github.com/mamedev/mame/commit/9afc7cdb5b57f6b15125d4d207baa7c61ee50287

Previous 199869 Revisions Next

© 1997-2024 The MAME Team