VirtualBox

Ignore:
Timestamp:
May 3, 2012 12:02:49 PM (13 years ago)
Author:
vboxsync
Message:

state_snapshot.c: Use SSMR3Skip instead of SMMR3GetMem to skip a few bytes ahead in the stream. GCC v4.5.2 cannot cope with the associated compile time assertions, commented them out.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c

    r41128 r41132  
    8080#define SHCROGL_CUT_FIELD_ALIGNMENT(_type, _prevField, _field) do { \
    8181            const int32_t cbAlignment = SHCROGL_CUT_FIELD_ALIGNMENT_SIZE(_type, _prevField, _field) ; \
    82             AssertCompile(SHCROGL_CUT_FIELD_ALIGNMENT_SIZE(_type, _prevField, _field) >= 0 && SHCROGL_CUT_FIELD_ALIGNMENT_SIZE(_type, _prevField, _field) < sizeof (void*)); \
     82            /*AssertCompile(SHCROGL_CUT_FIELD_ALIGNMENT_SIZE(_type, _prevField, _field) >= 0 && SHCROGL_CUT_FIELD_ALIGNMENT_SIZE(_type, _prevField, _field) < sizeof (void*));*/ \
    8383            if (cbAlignment) { \
    84                 void *Tmp; \
    85                 rc = SSMR3GetMem(pSSM, &Tmp, cbAlignment); \
     84                rc = SSMR3Skip(pSSM, cbAlignment); \
    8685            } \
    8786        } while (0)
     
    9089#define SHCROGL_CUT_TAIL_ALIGNMENT(_type, _lastField) do { \
    9190            const int32_t cbAlignment = SHCROGL_CUT_TAIL_ALIGNMENT_SIZE(_type, _lastField); \
    92             AssertCompile(SHCROGL_CUT_TAIL_ALIGNMENT_SIZE(_type, _lastField) >= 0 && SHCROGL_CUT_TAIL_ALIGNMENT_SIZE(_type, _lastField) < sizeof (void*)); \
     91            /*AssertCompile(SHCROGL_CUT_TAIL_ALIGNMENT_SIZE(_type, _lastField) >= 0 && SHCROGL_CUT_TAIL_ALIGNMENT_SIZE(_type, _lastField) < sizeof (void*));*/ \
    9392            if (cbAlignment) { \
    94                 void *Tmp; \
    95                 rc = SSMR3GetMem(pSSM, &Tmp, cbAlignment); \
     93                rc = SSMR3Skip(pSSM, cbAlignment); \
    9694            } \
    9795        } while (0)
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette