mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 23:54:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Portability fixes:

Browse source 
- Moved a few DBUG_ENTER statements after the variable declarations to satisfy some
   compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r) in ndb/src/common/portlib/NdbMutex.c
   and ndb/src/common/portlib/NdbThread.c
 - portability fix for FreeBSD 4.x and HPUX: replaced atoll() with strtoll() in 
   ndb/tools/config.cpp


ndb/src/common/portlib/NdbMutex.c:
   - Moved a few DBUG_ENTER statements after the variable declarations to satisfy some
     compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r)
ndb/src/common/portlib/NdbThread.c:
   - Moved a DBUG_ENTER statement after the variable declarations to satisfy some
     compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r)
ndb/tools/config.cpp:
   - portability fix for FreeBSD 4.x and HPUX: replaced atoll() with strtoll()
This commit is contained in:
unknown 2005-08-03 13:46:38 +02:00
commit 820a9c5f34
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ndb/src/common/portlib/NdbMutex.c
View file

@ -23,9 +23,9 @@
NdbMutex* NdbMutex_Create(void) NdbMutex* NdbMutex_Create(void)
{ {
DBUG_ENTER("NdbMutex_Create");
NdbMutex* pNdbMutex; NdbMutex* pNdbMutex;
int result; int result;
DBUG_ENTER("NdbMutex_Create");
pNdbMutex = (NdbMutex*)NdbMem_Allocate(sizeof(NdbMutex)); pNdbMutex = (NdbMutex*)NdbMem_Allocate(sizeof(NdbMutex));
DBUG_PRINT("info",("NdbMem_Allocate 0x%lx",pNdbMutex)); DBUG_PRINT("info",("NdbMem_Allocate 0x%lx",pNdbMutex));
@ -42,8 +42,8 @@ NdbMutex* NdbMutex_Create(void)
int NdbMutex_Destroy(NdbMutex* p_mutex) int NdbMutex_Destroy(NdbMutex* p_mutex)
{ {
DBUG_ENTER("NdbMutex_Destroy");
int result; int result;
DBUG_ENTER("NdbMutex_Destroy");
if (p_mutex == NULL) if (p_mutex == NULL)
DBUG_RETURN(-1); DBUG_RETURN(-1);

2
ndb/src/common/portlib/NdbThread.c
View file

@ -71,10 +71,10 @@ struct NdbThread* NdbThread_Create(NDB_THREAD_FUNC *p_thread_func,
const char* p_thread_name, const char* p_thread_name,
NDB_THREAD_PRIO thread_prio) NDB_THREAD_PRIO thread_prio)
{ {
DBUG_ENTER("NdbThread_Create");
struct NdbThread* tmpThread; struct NdbThread* tmpThread;
int result; int result;
pthread_attr_t thread_attr; pthread_attr_t thread_attr;
DBUG_ENTER("NdbThread_Create");
(void)thread_prio; /* remove warning for unused parameter */ (void)thread_prio; /* remove warning for unused parameter */

2
ndb/tools/config.cpp
View file

@ -359,7 +359,7 @@ Match::eval(NdbMgmHandle h, const Iter& iter)
} }
else if(iter.get(m_key, &val64) == 0) else if(iter.get(m_key, &val64) == 0)
{ {
if(atoll(m_value.c_str()) != val64) if(strtoll(m_value.c_str(), (char **)NULL, 10) != val64)
return 0; return 0;
} }
else if(iter.get(m_key, &valc) == 0) else if(iter.get(m_key, &valc) == 0)