mirror of
https://github.com/MariaDB/server.git
synced 2025-02-28 16:23:17 +01:00
Some platfom compile/build fixes for ndb
This commit is contained in:
parent
7c69afaf15
commit
f9337ba947
2 changed files with 4 additions and 4 deletions
ndb/include
|
@ -83,7 +83,7 @@ public:
|
||||||
static Uint32 LoadConst64(Uint32 Register); // Value in next 2 words
|
static Uint32 LoadConst64(Uint32 Register); // Value in next 2 words
|
||||||
static Uint32 Add(Uint32 DstReg, Uint32 SrcReg1, Uint32 SrcReg2);
|
static Uint32 Add(Uint32 DstReg, Uint32 SrcReg1, Uint32 SrcReg2);
|
||||||
static Uint32 Sub(Uint32 DstReg, Uint32 SrcReg1, Uint32 SrcReg2);
|
static Uint32 Sub(Uint32 DstReg, Uint32 SrcReg1, Uint32 SrcReg2);
|
||||||
static Uint32 Branch(Uint32 Inst, Uint32 R1, Uint32 R2);
|
static Uint32 Branch(Uint32 Inst, Uint32 Reg1, Uint32 Reg2);
|
||||||
static Uint32 ExitOK();
|
static Uint32 ExitOK();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -184,8 +184,8 @@ Interpreter::Sub(Uint32 Dcoleg, Uint32 SrcReg1, Uint32 SrcReg2){
|
||||||
|
|
||||||
inline
|
inline
|
||||||
Uint32
|
Uint32
|
||||||
Interpreter::Branch(Uint32 Inst, Uint32 R1, Uint32 R2){
|
Interpreter::Branch(Uint32 Inst, Uint32 Reg1, Uint32 Reg2){
|
||||||
return (R1 << 9) + (R2 << 6) + Inst;
|
return (Reg1 << 9) + (Reg2 << 6) + Inst;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline
|
inline
|
||||||
|
|
|
@ -176,7 +176,7 @@ public:
|
||||||
/**
|
/**
|
||||||
* Trim string from <i>delim</i>
|
* Trim string from <i>delim</i>
|
||||||
*/
|
*/
|
||||||
static char* trim(char * src, const char * delim = " \t");
|
static char* trim(char * src, const char * delim);
|
||||||
private:
|
private:
|
||||||
char* m_chr;
|
char* m_chr;
|
||||||
unsigned m_len;
|
unsigned m_len;
|
||||||
|
|
Loading…
Add table
Reference in a new issue