1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

win32: compilation failures, maria.test failure

include/my_global.h:
  enable compile_time_assert for all compilers
include/waiting_threads.h:
  1. don't #extern "C" system includes, they don't like it.
  2. remove any padding from WT_RESOURCE_ID structure - we want
  to compare it with memcmp
mysys/waiting_threads.c:
  assert that WT_RESOURCE_ID can be compared with memcmp
  and has no random padding bytes
This commit is contained in:
Sergei Golubchik
2008-10-21 20:10:49 +02:00
parent f8fc47f062
commit a58d20053d
3 changed files with 9 additions and 4 deletions

View File

@@ -19,10 +19,10 @@
#include <my_global.h>
#include <my_sys.h>
C_MODE_START
#include <lf.h>
C_MODE_START
typedef struct st_wt_resource_id WT_RESOURCE_ID;
typedef struct st_wt_resource_type {
@@ -30,10 +30,13 @@ typedef struct st_wt_resource_type {
const void *(*make_key)(WT_RESOURCE_ID *id, uint *len);
} WT_RESOURCE_TYPE;
/* we want to compare this struct with memcmp, make it packed */
#pragma pack(push,1)
struct st_wt_resource_id {
WT_RESOURCE_TYPE *type;
ulonglong value;
WT_RESOURCE_TYPE *type;
};
#pragma pack(pop)
#define WT_WAIT_STATS 24
#define WT_CYCLE_STATS 32