mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-24 01:23:03 +01:00
Misc
This commit is contained in:
parent
a6b3c390f4
commit
d8f739f53c
@ -46,7 +46,7 @@ namespace Firebird {
|
||||
|
||||
// NS: This code is adapted from from KernelEx project, with the explicit
|
||||
// permission from the author. KernelEx project aims to provide Windows XP
|
||||
// compatibility layer for Windows 98 and Windows ME. For futher information
|
||||
// compatibility layer for Windows 98 and Windows ME. For further information
|
||||
// please refer to http://www.sourceforge.net/projects/kernelex/
|
||||
|
||||
static const K32OBJ_CRITICAL_SECTION = 4;
|
||||
|
@ -79,6 +79,7 @@ private:
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
return thread == currTID;
|
||||
}
|
||||
};
|
||||
|
@ -172,7 +172,6 @@ void makeKey()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void initThreadCleanup()
|
||||
{
|
||||
int err = pthread_once(&keyOnce, makeKey);
|
||||
|
@ -43,6 +43,7 @@ public:
|
||||
static void add(FPTR_VOID_PTR cleanup, void* arg);
|
||||
static void remove(FPTR_VOID_PTR cleanup, void* arg);
|
||||
static void destructor(void*);
|
||||
|
||||
private:
|
||||
FPTR_VOID_PTR function;
|
||||
void* argument;
|
||||
|
@ -140,7 +140,7 @@ void Parser::transformString(const char* start, unsigned length, string& dest)
|
||||
}
|
||||
|
||||
*p = '\'';
|
||||
fb_assert(p <= buffer.begin() + newSize);
|
||||
fb_assert(p < buffer.begin() + newSize);
|
||||
|
||||
pos = s + mark.length;
|
||||
}
|
||||
|
@ -3712,8 +3712,8 @@ public:
|
||||
Firebird::system_call_failed::raise("SHGetSpecialFolderPath");
|
||||
}
|
||||
PathUtils::concatPath(lockPrefix, cmnData, LOCKDIR);
|
||||
#endif
|
||||
#endif
|
||||
#endif // WIN9X_SUPPORT
|
||||
#endif // WIN_NT
|
||||
}
|
||||
lockPrefix.copyTo(fb_prefix_lock_val, sizeof(fb_prefix_lock_val));
|
||||
fb_prefix_lock = fb_prefix_lock_val;
|
||||
|
@ -45,4 +45,3 @@ struct _SECURITY_ATTRIBUTES* ISC_get_security_desc();
|
||||
#endif
|
||||
|
||||
#endif // JRD_ISC_PROTO_H
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user