Attachment #250895 for bug #306479

Lines 14004-14011 xmlInitParser(void) { Link Here

(-)a/parser.c (-1 / +1 lines)
14004	__xmlGlobalInitMutexLock();	14004	__xmlGlobalInitMutexLock();
14005	if (xmlParserInitialized == 0) {	14005	if (xmlParserInitialized == 0) {
14006	#endif	14006	#endif
14007	xmlInitGlobals();
14008	xmlInitThreads();	14007	xmlInitThreads();
		14008	xmlInitGlobals();
14009	if ((xmlGenericError == xmlGenericErrorDefaultFunc) \|\|	14009	if ((xmlGenericError == xmlGenericErrorDefaultFunc) \|\|
14010	(xmlGenericError == NULL))	14010	(xmlGenericError == NULL))
14011	initGenericErrorDefaultFunc(NULL);	14011	initGenericErrorDefaultFunc(NULL);




    /* Make sure the global init lock is initialized and then lock it. */
#ifdef HAVE_PTHREAD_H
    /* The mutex is statically initialized, so we just lock it. */
    if (pthread_mutex_lock)
        pthread_mutex_lock(&global_init_lock);
#elif defined HAVE_WIN32_THREADS
    LPCRITICAL_SECTION cs;


__xmlGlobalInitMutexUnlock(void)
{
#ifdef HAVE_PTHREAD_H
    if (pthread_mutex_unlock)
        pthread_mutex_unlock(&global_init_lock);
#elif defined HAVE_WIN32_THREADS
    if (global_init_lock != NULL) {
	LeaveCriticalSection(global_init_lock);
-

Return to bug 306479

Lines 439-445 __xmlGlobalInitMutexLock(void) Link Here

(-)a/threads.c (-3 / +4 lines)
439	/* Make sure the global init lock is initialized and then lock it. */	439	/* Make sure the global init lock is initialized and then lock it. */
440	#ifdef HAVE_PTHREAD_H	440	#ifdef HAVE_PTHREAD_H
441	/* The mutex is statically initialized, so we just lock it. */	441	/* The mutex is statically initialized, so we just lock it. */
442	pthread_mutex_lock(&global_init_lock);	442	if (pthread_mutex_lock)
		443	pthread_mutex_lock(&global_init_lock);
443	#elif defined HAVE_WIN32_THREADS	444	#elif defined HAVE_WIN32_THREADS
444	LPCRITICAL_SECTION cs;	445	LPCRITICAL_SECTION cs;
445		446
Lines 508-514 void Link Here
508	__xmlGlobalInitMutexUnlock(void)	509	__xmlGlobalInitMutexUnlock(void)
509	{	510	{
510	#ifdef HAVE_PTHREAD_H	511	#ifdef HAVE_PTHREAD_H
511	pthread_mutex_unlock(&global_init_lock);	512	if (pthread_mutex_unlock)
		513	pthread_mutex_unlock(&global_init_lock);
512	#elif defined HAVE_WIN32_THREADS	514	#elif defined HAVE_WIN32_THREADS
513	if (global_init_lock != NULL) {	515	if (global_init_lock != NULL) {
514	LeaveCriticalSection(global_init_lock);	516	LeaveCriticalSection(global_init_lock);
515	-