Author: mikej Date: Mon May 28 01:01:08 2007 New Revision: 5224 Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/io/prfdcach.c freeswitch/trunk/libs/js/nsprpub/pr/src/io/prlog.c freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prinit.c freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c Log: fix bsd build Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/io/prfdcach.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/io/prfdcach.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/io/prfdcach.c Mon May 28 01:01:08 2007 @@ -259,8 +259,8 @@ ** be overridden at runtime using environment variables ** or a super-wiz-bang API. */ - //const char *low = PR_GetEnv("NSPR_FD_CACHE_SIZE_LOW"); - //const char *high = PR_GetEnv("NSPR_FD_CACHE_SIZE_HIGH"); + /* const char *low = PR_GetEnv("NSPR_FD_CACHE_SIZE_LOW"); */ + /* const char *high = PR_GetEnv("NSPR_FD_CACHE_SIZE_HIGH"); */ /* ** _low is allowed to be zero, _high is not. @@ -274,8 +274,8 @@ _pr_fd_cache.limit_high = 0; #endif /* defined(DEBUG) */ - //if (NULL != low) _pr_fd_cache.limit_low = atoi(low); - //if (NULL != high) _pr_fd_cache.limit_high = atoi(high); + /*if (NULL != low) _pr_fd_cache.limit_low = atoi(low);*/ + /*if (NULL != high) _pr_fd_cache.limit_high = atoi(high);*/ if (_pr_fd_cache.limit_high < _pr_fd_cache.limit_low) _pr_fd_cache.limit_high = _pr_fd_cache.limit_low; Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/io/prlog.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/io/prlog.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/io/prlog.c Mon May 28 01:01:08 2007 @@ -208,7 +208,7 @@ _pr_logLock = PR_NewLock(); -// ev = PR_GetEnv("NSPR_LOG_MODULES"); + /* ev = PR_GetEnv("NSPR_LOG_MODULES"); */ if (ev && ev[0]) { char module[64]; /* Security-Critical: If you change this * size, you must also change the sscanf @@ -255,7 +255,7 @@ } PR_SetLogBuffering(isSync ? bufSize : 0); - //ev = PR_GetEnv("NSPR_LOG_FILE"); + /* ev = PR_GetEnv("NSPR_LOG_FILE"); */ if (ev && ev[0]) { if (!PR_SetLogFile(ev)) { #ifdef XP_PC @@ -318,7 +318,7 @@ { char *ev = NULL; - //ev = PR_GetEnv("NSPR_LOG_MODULES"); + /* ev = PR_GetEnv("NSPR_LOG_MODULES"); */ if (ev && ev[0]) { char module[64]; /* Security-Critical: If you change this * size, you must also change the sscanf Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prinit.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prinit.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prinit.c Mon May 28 01:01:08 2007 @@ -202,7 +202,6 @@ _PR_InitSegs(); _PR_InitStacks(); _PR_InitTPD(); - //_PR_InitEnv(); _PR_InitLayerCache(); _PR_InitClock(); @@ -234,22 +233,10 @@ _PR_InitMem(); #endif - //_PR_InitCMon(); _PR_InitIO(); - //_PR_InitNet(); _PR_InitLog(); - //_PR_InitLinker(); _PR_InitCallOnce(); - //_PR_InitDtoa(); _PR_InitMW(); - //_PR_InitRWLocks(); - - //nspr_InitializePRErrorTable(); - -#if !defined(_PR_INET6) || defined(_PR_INET6_PROBE) - //_pr_init_ipv6(); -#endif - _PR_MD_FINAL_INIT(); } @@ -420,9 +407,7 @@ #endif _PR_CleanupMW(); - //_PR_CleanupDtoa(); _PR_CleanupCallOnce(); - //_PR_ShutdownLinker(); /* Release the primordial thread's private data, etc. */ _PR_CleanupThread(me); @@ -452,7 +437,6 @@ * Ideally, for each _PR_InitXXX(), there should be a corresponding * _PR_XXXCleanup() that we can call here. */ - //_PR_CleanupNet(); _PR_CleanupIO(); #ifdef WINNT _PR_CleanupCPUs(); @@ -461,7 +445,6 @@ PR_DestroyLock(_pr_sleeplock); _pr_sleeplock = NULL; _PR_CleanupLayerCache(); - //_PR_CleanupEnv(); _PR_CleanupStacks(); _PR_CleanupBeforeExit(); _pr_initialized = PR_FALSE; Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c Mon May 28 01:01:08 2007 @@ -938,9 +938,7 @@ PR_Unlock(pt_book.ml); _PR_CleanupMW(); - //_PR_CleanupDtoa(); _PR_CleanupCallOnce(); - //_PR_ShutdownLinker(); _PR_LogCleanup(); _PR_CleanupNet(); /* Close all the fd's before calling _PR_CleanupIO */ @@ -963,7 +961,6 @@ PR_DestroyLock(_pr_sleeplock); _pr_sleeplock = NULL; _PR_CleanupLayerCache(); - //_PR_CleanupEnv(); #ifdef _PR_ZONE_ALLOCATOR _PR_DestroyZones(); #endif